dan
/
cwtch
forked from cwtch.im/cwtch
1
0
Fork 0
Code Releases Wiki Activity
545 Commits 1 Branch 4 Tags 2.3 MiB
Commit Graph

545 Commits

Author SHA1 Message Date
Dan Ballard 558df278d7 Merge branch 'postalpha' of cwtch.im/cwtch into master 2019-02-19 21:04:19 +00:00
Sarah Jamie Lewis a210986140 Upgrade SendMessageToGroup to return the signature for UX tracking purposes 2019-02-19 12:20:39 -08:00
Dan Ballard 1b9fe4a1ce Merge branch 'peersend' of cwtch.im/cwtch into master 2019-02-14 23:10:41 +00:00
Sarah Jamie Lewis f056407cd0 Sending Message to an Offline Peer no longer blocks 2019-02-14 13:08:32 -08:00
Sarah Jamie Lewis eedfd872e5 Merge branch 'newlibricochet' of dan/cwtch into master 2019-02-14 20:17:53 +00:00
Dan Ballard 30722415d5 new libricochet release 2019-02-14 12:09:29 -08:00
erinn d15585eda7 Merge branch 'groupimportfix' of cwtch.im/cwtch into master 2019-02-14 02:50:39 +00:00
Sarah Jamie Lewis 46bab264b4 Adding Accept Invite Flow 2019-02-13 17:57:42 -08:00
Dan Ballard 862476293c Merge branch 'groupimportfix' of cwtch.im/cwtch into master 2019-02-13 04:14:59 +00:00
Sarah Jamie Lewis 27e42afbbf Adding Error Checking 2019-02-12 19:41:09 -08:00
erinn 2ed05dc8cd Merge branch 'groupimportfix' of cwtch.im/cwtch into master 2019-02-13 02:49:09 +00:00
Sarah Jamie Lewis b607293c2d Fixing json/protobuf confusion 2019-02-12 18:46:23 -08:00
erinn 6ebf8ebc88 Merge branch 'groupimportfix' of cwtch.im/cwtch into master 2019-02-13 02:06:46 +00:00
Sarah Jamie Lewis 3f6623bf42 Cutting cruft from import group 2019-02-12 18:04:21 -08:00
Sarah Jamie Lewis de32784286 Merge branch 'joindisonnect' of dan/cwtch into master 2019-02-12 04:02:41 +00:00
Dan Ballard 8959382449 on manageServerConnection, always start a new one (fetch) and the replace existing if, and close 2019-02-11 17:09:47 -08:00
Sarah Jamie Lewis 1620621d89 Merge branch 'ebf201902111339' of cwtch.im/cwtch into master 2019-02-11 21:53:54 +00:00
erinn 1f5a8685c4 store name of new contacts correctly 2019-02-11 13:40:20 -08:00
erinn cadf00621b Merge branch 'groupinvitefix' of cwtch.im/cwtch into master 2019-02-11 20:20:48 +00:00
Sarah Jamie Lewis 8f3b607053 Fixing New Group Invite flow 2019-02-11 11:09:28 -08:00
Dan Ballard ef480985a2 Merge branch 'group-map-fix' of cwtch.im/cwtch into master 2019-02-05 19:01:46 +00:00
Sarah Jamie Lewis 84a10a9f5e Fixing unitialized map 2019-02-05 10:58:14 -08:00
Sarah Jamie Lewis 58535b0eb6 Merge branch 'master' of dan/cwtch into master 2019-02-04 22:26:14 +00:00
Dan Ballard c8541a5e36 fix integ tests to not leak go threads, re make it an error 2019-02-04 14:18:24 -08:00
Dan Ballard b845673d10 Merge branch 'addcontactbugfix' of cwtch.im/cwtch into master 2019-02-04 19:57:04 +00:00
Sarah Jamie Lewis c4d55aee59 Merge branch 'master' of dan/cwtch into master 2019-02-04 19:54:54 +00:00
Dan Ballard 4d11547393 grou[ invite also gets random local id 2019-02-04 11:53:42 -08:00
Sarah Jamie Lewis eb2a770085 Fix AddContact 2019-02-04 11:39:58 -08:00
Dan Ballard 742d36734b Merge branch 'storagebugfix' of cwtch.im/cwtch into master 2019-02-04 19:19:30 +00:00
Sarah Jamie Lewis ffa2144b9f Save initial profile store 2019-02-04 11:17:33 -08:00
Dan Ballard ef2b95c54b Merge branch 'storagebugfix' of cwtch.im/cwtch into master 2019-02-04 19:09:36 +00:00
Sarah Jamie Lewis 5d0c950319 Bugfix Streamstore 2019-02-04 11:02:07 -08:00
Dan Ballard 0218159114 Merge branch 'profilefix' of cwtch.im/cwtch into master 2019-02-04 19:00:59 +00:00
Sarah Jamie Lewis 5399a31a6f Fixing Profile Creation Bug 2019-02-04 10:44:09 -08:00
Dan Ballard f52144a67c Merge branch 'storagebugfix' of cwtch.im/cwtch into master 2019-02-04 03:31:22 +00:00
Sarah Jamie Lewis 33a8922e43 Message Store Fix 2019-02-03 17:55:35 -08:00
erinn b93de92fdd Merge branch 'storagebugfix' of cwtch.im/cwtch into master 2019-02-03 04:10:21 +00:00
Sarah Jamie Lewis 2b47c50d0d Fixing up first time storage and ensuring we no longer dupe messages in timeline 2019-02-02 19:24:42 -08:00
Sarah Jamie Lewis b9f7ab3757 Merge branch 'ebf201902021718' of cwtch.im/cwtch into master 2019-02-03 01:24:16 +00:00
erinn ac077521be save new groups and group timelines 2019-02-02 17:18:33 -08:00
Sarah Jamie Lewis 34e0a8f925 Merge branch 'storage-eb' of dan/cwtch into master 2019-01-31 21:34:02 +00:00
Dan Ballard a0dab022ad stream storage for timelines, wired into profile store 2019-01-30 14:29:27 -08:00
Dan Ballard 44173c9f52 Merge branch 'ebf201901281158' of cwtch.im/cwtch into master 2019-01-29 18:44:44 +00:00
erinn 4d7b925581 Merge branch 'ricochet1.0.1' of cwtch.im/cwtch into master 2019-01-28 23:02:35 +00:00
Sarah Jamie Lewis fea46b5aaf Updating Cwtch to Depend on Ricochet v1.0.1 2019-01-28 15:01:45 -08:00
erinn 232a554e88 Merge branch 'ineffassign' of cwtch.im/cwtch into master 2019-01-28 23:01:04 +00:00
Sarah Jamie Lewis 2239463512 ineffassign and misspell 2019-01-28 12:12:33 -08:00
erinn ad7cddaacf add storage eventbus calls 2019-01-28 11:59:00 -08:00
Dan Ballard 2db7385ce0 Merge branch 'update-libricochet' of cwtch.im/cwtch into master 2019-01-23 21:11:10 +00:00
Sarah Jamie Lewis 9e055f1ee0 Updating libricochet to latest 2019-01-23 12:50:53 -08:00