Commit Graph

328 Commits

Author SHA1 Message Date
Dan Ballard f1d2e6a310 Merge pull request 'add caching and filtering of contact state change events; change logic from contact auth to approved/blocked' (#58) from fixAcceptblock into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #58
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2022-01-06 22:10:28 +00:00
Dan Ballard 4da1cb70df Merge branch 'trunk' into fixAcceptblock
continuous-integration/drone/pr Build is pending Details
2022-01-06 22:10:16 +00:00
Dan Ballard 86dfe63a8f add caching and filtering of contact state change events; change logic from contact auth to approved/blocked
continuous-integration/drone/pr Build is pending Details
2022-01-06 17:09:49 -05:00
Sarah Jamie Lewis 9c32586068 Merge pull request 'pass along storage migration messages' (#57) from migrateMessage into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #57
2022-01-05 17:05:26 +00:00
Dan Ballard fa42ce1fb1 Merge branch 'trunk' into migrateMessage
continuous-integration/drone/pr Build is passing Details
2022-01-04 23:54:45 +00:00
Dan Ballard a1e06a868f Merge pull request 'don't fetch metrics for non running servers' (#56) from lastFixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #56
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-12-20 23:35:31 +00:00
Dan Ballard 6fb5234724 pin drone container version to deal with docker hub instability
continuous-integration/drone/pr Build is passing Details
2021-12-20 18:22:44 -05:00
Dan Ballard 8598802abd don't fetch metrics for non running servers
continuous-integration/drone/pr Build encountered an error Details
2021-12-20 18:12:34 -05:00
Dan Ballard 95c36703cc Merge pull request 'Remove SendMessageTo*Errors / Upgrade Cwtch' (#55) from change_password into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #55
2021-12-19 20:56:07 +00:00
Sarah Jamie Lewis 9e575f6801 Merge branch 'trunk' into change_password
continuous-integration/drone/pr Build is passing Details
2021-12-19 20:36:50 +00:00
Sarah Jamie Lewis 32c3d93e4d Upgrade Cwtch
continuous-integration/drone/pr Build is pending Details
2021-12-19 12:36:09 -08:00
Sarah Jamie Lewis 75a31fd096 Merge pull request 'fix some name sync behaviour' (#54) from syncName into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #54
2021-12-19 20:33:43 +00:00
Dan Ballard ba4b31f06b fix some name sync behaviour
continuous-integration/drone/pr Build is passing Details
2021-12-19 13:52:10 -05:00
Sarah Jamie Lewis ab2375e57c Upgrade Cwtch and Remove SendMessageFrom*Error 2021-12-18 18:13:12 -08:00
Sarah Jamie Lewis 68c02502a2 Merge pull request 'change_password' (#53) from change_password into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #53
Reviewed-by: erinn <erinn@openprivacy.ca>
2021-12-19 01:30:40 +00:00
Sarah Jamie Lewis 597b09dba9 go mod tidy
continuous-integration/drone/pr Build is passing Details
2021-12-18 17:26:04 -08:00
Sarah Jamie Lewis d6c1b386a9 Change Password API
continuous-integration/drone/pr Build is passing Details
2021-12-18 17:23:43 -08:00
Sarah Jamie Lewis 212e71a1b9 ChangePassword APIs 2021-12-18 17:22:59 -08:00
Sarah Jamie Lewis 306c074e7e Upgrade Cwtch and Server 2021-12-18 17:22:31 -08:00
Sarah Jamie Lewis e4244aeb31 Merge pull request 'image previews' (#51) from ipreview into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #51
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-12-19 01:21:40 +00:00
erinn 11bbc3aa78 bump cwtch and fix miscommits
continuous-integration/drone/pr Build is pending Details
2021-12-18 17:20:08 -08:00
erinn f4ff802460 image previews sarah comments
continuous-integration/drone/pr Build is pending Details
2021-12-18 17:16:21 -08:00
erinn 8b38a8b159 Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/libcwtch-go into ipreview 2021-12-18 16:42:48 -08:00
Sarah Jamie Lewis a3707bcadb Merge pull request 'cwtch upgrade dropping unused events; android build notes' (#52) from cwtchUp into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #52
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-12-18 21:54:24 +00:00
Dan Ballard 4903e9376b fix logic error on loading peer
continuous-integration/drone/pr Build is passing Details
2021-12-18 16:31:52 -05:00
Dan Ballard d30052176b pass along storage migration messages
continuous-integration/drone/pr Build is passing Details
2021-12-17 19:56:38 -05:00
Dan Ballard 4c48fd603d cwtch upgrade dropping unused events; android build notes
continuous-integration/drone/pr Build is pending Details
2021-12-17 15:38:26 -05:00
erinn eb33f11127 message previews - remove debug
continuous-integration/drone/pr Build is pending Details
2021-12-16 16:50:21 -08:00
erinn d59d54ab6a image previews 2021-12-16 16:43:23 -08:00
erinn cac25c0d67 Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/libcwtch-go into ipreview 2021-12-14 13:29:08 -08:00
erinn 1b0333d468 wip image previews 2021-12-14 13:23:32 -08:00
Sarah Jamie Lewis aa102bd169 Merge pull request 'fix server description; fix serverInfo to have identifier; add themeMode to settings; cwtch bump' (#50) from minorFixs into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #50
2021-12-11 05:50:59 +00:00
Dan Ballard d2abed7583 fix server description; fix serverInfo to have identifier; add themeMode to settings; cwtch bump
continuous-integration/drone/pr Build is passing Details
2021-12-10 16:28:13 -08:00
Sarah Jamie Lewis 28a13aaca9 Merge pull request 'server metrics' (#49) from serverStats into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #49
2021-12-08 05:31:19 +00:00
Dan Ballard 9eadc77afd cwtch and server updates
continuous-integration/drone/pr Build is passing Details
2021-12-07 19:00:10 -08:00
Dan Ballard 69df789355 add support for server metrics; delete eventhandler dup fn for push(); make server response to settings change stateful 2021-12-07 18:59:53 -08:00
Dan Ballard 37eb9f681a minor support to manage profile servers 2021-12-07 18:54:09 -08:00
Sarah Jamie Lewis 5d7f45e50d Merge pull request 'minor support to manage profile servers' (#48) from manageProfileServers into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #48
2021-12-08 02:52:04 +00:00
Dan Ballard 35abad7224 cwtch attribute changes
continuous-integration/drone/pr Build is passing Details
2021-12-07 18:21:24 -08:00
Dan Ballard 25d035267a minor support to manage profile servers 2021-12-07 18:13:56 -08:00
Sarah Jamie Lewis 79a87b78e0 Merge pull request 'libCwtch-go changes for storage engine refactor and profile api changes' (#47) from cwtch_refactor into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #47
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-12-08 00:44:03 +00:00
Sarah Jamie Lewis a43c225267 Cleaning up group functionality after merge
continuous-integration/drone/pr Build is passing Details
2021-12-07 13:49:20 -08:00
Sarah Jamie Lewis 8e80dbaf78 Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/libcwtch-go into cwtch_refactor
continuous-integration/drone/pr Build is failing Details
2021-12-07 13:43:08 -08:00
Sarah Jamie Lewis 1aea1c6e5f Upgrade Cwtch and Server
continuous-integration/drone/pr Build is pending Details
2021-12-07 13:40:24 -08:00
Sarah Jamie Lewis 62f3d8878e Reset to lib
continuous-integration/drone/pr Build is pending Details
2021-12-06 12:23:57 -08:00
Sarah Jamie Lewis fee6c7e641 Fixup Event Handling for UI Cache
continuous-integration/drone/pr Build is pending Details
2021-12-06 12:22:49 -08:00
Sarah Jamie Lewis e31d31d76f Further clarifications on Event Model, Support for Attributes in Message APIs
continuous-integration/drone/pr Build is pending Details
2021-12-01 04:16:15 -08:00
Sarah Jamie Lewis b0f54bb169 SetMessageAttribute + Fallback to handle for new messages 2021-11-30 13:32:01 -08:00
Sarah Jamie Lewis bd176f89cd Prefer local overrides
continuous-integration/drone/pr Build is pending Details
2021-11-26 15:07:20 -08:00
Sarah Jamie Lewis 92d2925622 NewMessageByID, Suppress Network Tests
continuous-integration/drone/pr Build is pending Details
2021-11-26 14:26:26 -08:00