Commit graph

9207 commits

Author SHA1 Message Date
Matthew Chen
f4db5e6bbb Merge branch 'charlesmchen/accountAttributeUpdates' 2018-10-12 17:38:29 -04:00
Matthew Chen
c9922cda3e Respond to CR. 2018-10-12 17:38:13 -04:00
Matthew Chen
8fdf6009f9 Sync contacts after rotating profile key. 2018-10-12 17:19:00 -04:00
Matthew Chen
eb7abdfc64 Account attributes updates. 2018-10-12 17:19:00 -04:00
Matthew Chen
f1d93d4472 Merge remote-tracking branch 'origin/release/2.30.2' 2018-10-12 16:00:42 -04:00
Matthew Chen
c995c838d2 "Bump build to 2.30.2.14." 2018-10-12 15:32:50 -04:00
Matthew Chen
97d6ac3706 Merge branch 'mkirk/blue-group' into release/2.30.2 2018-10-12 15:32:37 -04:00
Michael Kirk
d5f69e4bba feature flag for group avatar color 2018-10-12 15:32:03 -04:00
Matthew Chen
ebd3560547 "Bump build to 2.30.2.13." 2018-10-12 14:13:24 -04:00
Matthew Chen
6fe05a61bf Merge branch 'charlesmchen/sendDeliveryReceipts' 2018-10-12 14:09:00 -04:00
Matthew Chen
5e0bc1bc1e Respond to CR. 2018-10-12 14:08:42 -04:00
Michael Kirk
3e85c8c023 clang-format branch changes 2018-10-12 13:52:46 -04:00
Matthew Chen
b53cb9e616 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
5cf8909a28 Modify OWSOutgoingReceiptManager to handle read receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
010ce1f6c2 Rename to OWSOutgoingReceiptManager. 2018-10-12 13:52:46 -04:00
Matthew Chen
2b45a8348e Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
f5591ef7b7 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
62d1fd2025 Clean up ahead of PR. 2018-10-12 13:52:46 -04:00
Matthew Chen
45d6250aee Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
de7bffa593 Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
13373db3bc Send delivery receipts. 2018-10-12 13:52:46 -04:00
Matthew Chen
b5f6670dee Merge branch 'charlesmchen/obsoleteCDSConstant' 2018-10-12 13:51:44 -04:00
Matthew Chen
9ef0f35d26 Remove obsolete CDS constant. 2018-10-12 13:51:33 -04:00
Matthew Chen
45119d7efc Merge branch 'charlesmchen/udStatusSync' 2018-10-12 13:49:19 -04:00
Matthew Chen
c5f52cc0b9 Respond to CR. 2018-10-12 13:49:05 -04:00
Matthew Chen
fd9ee4c9f3 Fix small bug. 2018-10-12 13:49:05 -04:00
Matthew Chen
7e7fcc1698 Apply UD status from transcripts. 2018-10-12 13:49:05 -04:00
Matthew Chen
0c6c506a36 Send UD status in sync messages. 2018-10-12 13:49:04 -04:00
Matthew Chen
994e95a644 Update protos. 2018-10-12 13:49:04 -04:00
Michael Kirk
76b3050344 Merge branch 'mkirk/cds-failures' into release/2.30.2 2018-10-12 11:07:19 -06:00
Michael Kirk
5edf2e426e Only report attestation failure if we *received* the attestion.
per Jeff
2018-10-12 11:06:21 -06:00
Michael Kirk
c4550ebc90 don't submit feedback for connectivity errors 2018-10-12 11:06:21 -06:00
Michael Kirk
e22ad8ba66 include underlying error in wrapped TSNetworkErrors 2018-10-12 11:06:21 -06:00
Michael Kirk
e7170dc6e8 conventional error structure for connectivity error 2018-10-12 11:06:21 -06:00
Michael Kirk
4820af8ea5 Merge branch 'mkirk/ud-ui-2' into master 2018-10-12 09:37:53 -06:00
Michael Kirk
43884af191 remove redundant "failed to download" method 2018-10-12 09:31:26 -06:00
Michael Kirk
efe07e1ddb Secret sender icon in message details 2018-10-12 09:31:03 -06:00
Michael Kirk
54b184bc97 Whitelist cds domain 2018-10-11 18:05:51 -06:00
Matthew Chen
2054bdc690 "Bump build to 2.31.0.0." 2018-10-11 16:58:17 -04:00
Matthew Chen
51699ebc04 "Bump build to 2.30.2.12." 2018-10-11 16:42:36 -04:00
Michael Kirk
d3d5dd71af Merge branch 'mkirk/dark-theme-toggle' into release/2.30.2 2018-10-11 14:28:20 -06:00
Michael Kirk
4435d16f9c dark theme toggle in app settings 2018-10-11 13:40:51 -06:00
Matthew Chen
aa04608e7e Merge branch 'charlesmchen/blockListVsProfileWhitelist' 2018-10-11 13:07:56 -04:00
Matthew Chen
794914353d Respond to CR. 2018-10-11 13:07:25 -04:00
Matthew Chen
f00f608833 Respond to CR. 2018-10-11 13:02:02 -04:00
Matthew Chen
f7827cda7b Respond to CR. 2018-10-11 13:02:02 -04:00
Matthew Chen
0ce2e4d4d9 Rotate profile key if blocklist intersects profile whitelist. 2018-10-11 13:02:02 -04:00
Matthew Chen
c907721a18 Rotate profile key if blocklist intersects profile whitelist. 2018-10-11 13:02:02 -04:00
Matthew Chen
d8a0baf9ee Merge branch 'charlesmchen/udFixes' 2018-10-11 13:01:01 -04:00
Matthew Chen
1f37980a0d Suppress UD against production service to avoid de-registration. 2018-10-11 13:00:53 -04:00