Commit Graph

8132 Commits

Author SHA1 Message Date
Matthew Chen
492debce41 Merge branch 'charlesmchen/remoteTwistedOak' 2018-07-23 13:25:32 -04:00
Matthew Chen
88be3a5755 Respond to CR. 2018-07-23 13:25:21 -04:00
Matthew Chen
819c2b1ceb Remove Twisted Oak. 2018-07-23 13:24:33 -04:00
Matthew Chen
1ec04bc378 Merge branch 'charlesmchen/remoteAttestation3' 2018-07-23 13:18:08 -04:00
Matthew Chen
c3d47d3323 Respond to CR. 2018-07-23 13:17:43 -04:00
Matthew Chen
904ed1549e Add unit test around remote attestation. 2018-07-23 13:13:02 -04:00
Matthew Chen
2427df23f1 Merge branch 'charlesmchen/remoteAttestation2' 2018-07-23 13:00:50 -04:00
Matthew Chen
797bd9be38 Respond to CR. 2018-07-23 12:59:55 -04:00
Matthew Chen
81a940a27f Clean up ahead of CR. 2018-07-23 12:59:55 -04:00
Matthew Chen
7acf9b15e1 Finish signature verification. 2018-07-23 12:59:55 -04:00
Matthew Chen
7476ef123d Remote attestation. 2018-07-23 12:59:55 -04:00
Michael Kirk
551bb5b93b ubsan fixup 2018-07-21 07:49:48 -07:00
Matthew Chen
a680e70b4b Merge branch 'charlesmchen/refineHomeView2' 2018-07-20 15:47:58 -04:00
Matthew Chen
2b1f928770 Respond to CR. 2018-07-20 15:47:37 -04:00
Matthew Chen
b90e406a57 Clean up ahead of PR. 2018-07-20 15:38:37 -04:00
Matthew Chen
48975eaac8 Respond to CR. 2018-07-20 15:37:47 -04:00
Matthew Chen
b2b95597cc Refine views. 2018-07-20 15:26:46 -04:00
Matthew Chen
8862f9a531 Refine views. 2018-07-20 15:26:46 -04:00
Matthew Chen
fcbf8d4dc2 Refine views. 2018-07-20 15:26:46 -04:00
Matthew Chen
9f9e0965d5 Refine table views. 2018-07-20 15:26:46 -04:00
Michael Kirk
0025999b22 Merge branch 'mkirk/fix-overzealous-error' 2018-07-20 09:55:48 -06:00
Michael Kirk
ab1190222b Fix overzealous failure when user has no Signal contacts
// FREEBIE
2018-07-20 09:55:40 -06:00
Michael Kirk
90430c75c0 update ubsan 2018-07-20 08:55:32 -06:00
Matthew Chen
e88e7ef759 Merge branch 'charlesmchen/remoteAttestation' 2018-07-20 10:35:15 -04:00
Matthew Chen
81bd4c46e9 Update cocoapods for CDS. 2018-07-20 10:34:54 -04:00
Matthew Chen
75c3b385b2 Respond to CR. 2018-07-20 10:32:15 -04:00
Matthew Chen
97eb405a9e Revert temporary changes. 2018-07-20 09:58:58 -04:00
Matthew Chen
f2fdb96931 Clean up ahead of PR. 2018-07-20 09:56:37 -04:00
Matthew Chen
460f7344ad Remote attestation. 2018-07-20 09:55:18 -04:00
Matthew Chen
6686ecb125 Remote attestation. 2018-07-20 09:55:17 -04:00
Matthew Chen
d7bb2b7505 Remote attestation. 2018-07-20 09:55:17 -04:00
Matthew Chen
f3ba6d4c27 Remote attestation. 2018-07-20 09:55:17 -04:00
Michael Kirk
20284ebc84 update BUILDING.md 2018-07-20 07:48:22 -06:00
Michael Kirk
6082bd9183 Merge branch 'mkirk/update-san' 2018-07-19 13:55:42 -06:00
Michael Kirk
9e348f2a27 update ubsan 2018-07-19 13:41:15 -06:00
Michael Kirk
0513077d29 Merge branch 'mkirk/batch-contact-intersections' 2018-07-19 13:40:38 -06:00
Michael Kirk
eb4c62593b Cancel quickly if dependent operation fails 2018-07-19 13:40:30 -06:00
Michael Kirk
90214ae578 make contact intersection queue serial 2018-07-19 13:40:30 -06:00
Michael Kirk
0db339b849 fixup double failure 2018-07-19 13:40:30 -06:00
Michael Kirk
9293eb96f7 code re-org 2018-07-19 13:40:30 -06:00
Michael Kirk
344c2a37c8 update pods for batching contact intersections 2018-07-19 13:40:30 -06:00
Michael Kirk
75248b5dc7 Stub out feedback operation
// FREEBIE
2018-07-19 13:40:30 -06:00
Michael Kirk
b7288b2565 Move contact intersection into batched operation
// FREEBIE
2018-07-19 13:40:30 -06:00
Michael Kirk
f277ae877c Clarify OWSOperation behavior (no behavioral changes) 2018-07-19 13:40:30 -06:00
Michael Kirk
e05877a019 Merge branch 'update-translations' 2018-07-19 09:45:47 -06:00
Nancy Mast
4ab6892e27 changed string text for MULTIDEVICE_PAIRING_MAX_DESC, ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY, CONTACT_FIELD_ADDRESS_POSTCODE, END_CALL_RESPONDER_IS_BUSY. changed comment for SETTINGS_INVITE_TWITTER_TEXT 2018-07-19 09:45:44 -06:00
Nancy Mast
c2f7c15f72 removed jsq strings, modified MULTIDEVICE_PAIRING_MAX_RECOVERY text and comment 2018-07-19 09:45:44 -06:00
Matthew Chen
a9353ed4e8 Merge branch 'charlesmchen/deltaContactIntersection2' 2018-07-19 11:31:23 -04:00
Matthew Chen
39c7fd9f15 Respond to CR. 2018-07-19 11:31:04 -04:00
Matthew Chen
3aa28aee36 Respond to CR. 2018-07-18 15:09:29 -04:00