Commit Graph

561 Commits

Author SHA1 Message Date
erinn db781042a9 Merge branch 'emptyfile' of dan/cwtch into master 2019-04-17 15:09:05 -07:00
Dan Ballard f519da5cde Merge branch 'ebf' of cwtch.im/cwtch into master 2019-04-17 11:37:40 -07:00
Dan Ballard f3fb1a42dd rm empty file 2019-04-17 11:36:19 -07:00
erinn 8ea11f8afd suppress non-erroneous error message 2019-04-15 11:57:22 -07:00
Sarah Jamie Lewis 45b1a10fff Merge branch 'backoff-retry' of dan/cwtch into master 2019-03-29 13:43:49 -07:00
Dan Ballard 7640fc1c0d graceful backoffs on connection retries 2019-03-25 13:11:18 -07:00
Dan Ballard 3671d91287 Merge branch 'ebf201903251154' of cwtch.im/cwtch into master 2019-03-25 13:03:12 -07:00
erinn 5ece75b3a8 squelch pointless message 2019-03-25 11:55:04 -07:00
erinn 94664d5604 Merge branch 'postalpha' of cwtch.im/cwtch into master 2019-03-04 21:11:37 +00:00
Sarah Jamie Lewis 6697c73222 Improving peer error handling 2019-03-03 18:10:23 -08:00
Dan Ballard fca4fe17eb Merge branch 'postalpha' of cwtch.im/cwtch into master 2019-02-20 21:13:47 +00:00
Sarah Jamie Lewis 711e46ce10 Adding Error Tracking to Group Sends 2019-02-20 13:01:01 -08:00
Dan Ballard 600e1b31e6 Merge branch 'postalpha' of cwtch.im/cwtch into master 2019-02-20 20:13:25 +00:00
Sarah Jamie Lewis 83faab35a3 Keeping track of anack'd group messages 2019-02-20 12:03:26 -08:00
Sarah Jamie Lewis 4af7773bec Merge branch 'ricochet103' of dan/cwtch into master 2019-02-20 19:56:39 +00:00
Dan Ballard f66f0273a6 bump libricochet to 1.0.3 2019-02-20 11:49:26 -08:00
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