Commit Graph

8192 Commits

Author SHA1 Message Date
Jesse Squires
196b2fb1fa
[Build] Update clone instructions
Per discussion [here](https://community.signalusers.org/t/not-able-to-build-in-xcode-9-3-9-4/3498/12).

Using `--recurse-submodules` will init and update all submodules, so you can do everything at once. I find this a bit nicer.
(Also, it seems like it might be more reliable with GitHub forks?)

I realize `make dependencies` runs `git submodule update --init`. It will just be a no-op if you clone this way.
2018-07-24 16:50:12 -07:00
Michael Kirk
2298d50d12 Merge branch 'mkirk/cds-retry' 2018-07-24 10:14:00 -06:00
Michael Kirk
f002f89f2c Update retryable
Per Jeff, don't handle CDS requests yet.
2018-07-24 10:13:37 -06:00
Michael Kirk
0598733fc6 Merge branch 'mkirk/cds-feedback-2' 2018-07-24 10:03:58 -06:00
Michael Kirk
3507367a90 Don't report feedback for HTTP errors.
// FREEBIE
2018-07-24 10:03:47 -06:00
Michael Kirk
11db859e6b adapt to changes since RI 2018-07-23 16:19:23 -06:00
Michael Kirk
6e1c1a681b Merge tag '2.28.0.12' 2018-07-23 16:12:46 -06:00
Michael Kirk
6518aa24a3 "Bump build to 2.28.0.12." 2018-07-23 16:10:38 -06:00
Michael Kirk
d04bb86258 sync translations 2018-07-23 16:10:33 -06:00
Matthew Chen
48fb652d83 Merge branch 'charlesmchen/unknownObjectVsNPE' 2018-07-23 16:05:56 -06:00
Matthew Chen
76f0a6b8b4 Merge branch 'charlesmchen/unknownObjectVsNPE' 2018-07-23 17:13:52 -04:00
Matthew Chen
5530b8d701 Respond to CR. 2018-07-23 17:13:01 -04:00
Matthew Chen
7a898f5e99 Fix NPE using mock for unknown database objects. 2018-07-23 16:53:02 -04:00
Matthew Chen
2c973782c4 Fix NPE using mock for unknown database objects. 2018-07-23 16:52:00 -04:00
Matthew Chen
723691400f Fix NPE using mock for unknown database objects. 2018-07-23 16:50:12 -04:00
Matthew Chen
708ef6f7dd Fix NPE using mock for unknown database objects. 2018-07-23 16:42:11 -04:00
Matthew Chen
060e0fd062 Fix NPE using mock for unknown database objects. 2018-07-23 16:40:01 -04:00
Matthew Chen
79dcbf8a79 Update cocoapods. 2018-07-23 15:58:08 -04:00
Matthew Chen
28ad8d065b Revert Pods update. 2018-07-23 15:57:08 -04:00
Michael Kirk
fd9125ce1a Merge branch 'mkirk/remove-swipe-for-info' into release/2.28.0 2018-07-23 13:08:53 -06:00
Michael Kirk
2d4eb7d057 remove interactive 'swipe for info' 2018-07-23 13:08:41 -06:00
Michael Kirk
57c4d97093 Merge branch 'mkirk/speed-up-message-action-presentation' into release/2.28.0 2018-07-23 13:08:07 -06:00
Michael Kirk
aba358e894 faster message actions presentation 2018-07-23 13:07:51 -06:00
Michael Kirk
f31c6a22f0 Merge branch 'mkirk/cds-feedback' 2018-07-23 13:07:12 -06:00
Michael Kirk
558b3bd245 Report contact discovery feedback 2018-07-23 13:06:40 -06:00
Michael Kirk
0721000251 Merge branch 'mkirk/contact-discovery' 2018-07-23 13:05:56 -06:00
Michael Kirk
8c5d6ba9bb Respond to code review. 2018-07-23 12:21:54 -06:00
Michael Kirk
b42f528713 Integrate with new contact discovery endpoint
Also:
* use system cookie parsing
* add AESGCM additional authenticated data parameter

// FREEBIE
2018-07-23 12:21:54 -06:00
Michael Kirk
a611625691 fixup lookup threading 2018-07-23 12:20:35 -06:00
Michael Kirk
dedfea78da callback handlers for remote attestation 2018-07-23 12:20:35 -06:00
Michael Kirk
58e2e13836 Merge branch 'mkirk/fixup-navbar' into release/2.28.0 2018-07-23 12:18:44 -06:00
Michael Kirk
1d4ead080b fix color behind navbar 2018-07-23 12:18:01 -06:00
Matthew Chen
e27e45e661 Merge branch 'charlesmchen/socketVsNewLinkedDevice' 2018-07-23 14:12:03 -04:00
Matthew Chen
bebb8ecfd1 Cycle the socket after linking a new device. 2018-07-23 14:11:51 -04:00
Matthew Chen
c92f843530 Merge branch 'charlesmchen/byteParser' 2018-07-23 14:10:37 -04:00
Matthew Chen
b197e4776e Respond to CR. 2018-07-23 14:10:26 -04:00
Matthew Chen
82ebb6e764 Update cocoapods. 2018-07-23 14:05:37 -04:00
Matthew Chen
73eb0778c0 Add unit tests around byte parser. 2018-07-23 14:00:58 -04:00
Matthew Chen
28f021ba55 Pull byte parser out into separate source file. 2018-07-23 14:00:17 -04:00
Matthew Chen
2fd996a24a Merge branch 'charlesmchen/internJSQ' 2018-07-23 13:56:35 -04:00
Matthew Chen
10636957a2 Intern JSQMessagesViewController. 2018-07-23 13:56:14 -04:00
Matthew Chen
e0db33e638 Intern JSQMessagesViewController. 2018-07-23 13:48:24 -04:00
Matthew Chen
25a98554b7 Intern JSQMessagesViewController. 2018-07-23 13:48:24 -04:00
Matthew Chen
906d0b01a4 Fix build break. 2018-07-23 13:47:03 -04:00
Matthew Chen
6c02c2065c Merge branch 'charlesmchen/sendToSelfIsRead' 2018-07-23 13:27:19 -04:00
Matthew Chen
baed561033 Mark message sent to self as read. 2018-07-23 13:27:10 -04:00
Matthew Chen
77fd69c4e3 Merge branch 'charlesmchen/contactsVsConcurrency' 2018-07-23 13:26:24 -04:00
Matthew Chen
304240f263 Fix concurrency in contacts updater. 2018-07-23 13:26:19 -04:00
Matthew Chen
9904443fcf Fix concurrency in contacts updater. 2018-07-23 13:26:19 -04:00
Matthew Chen
492debce41 Merge branch 'charlesmchen/remoteTwistedOak' 2018-07-23 13:25:32 -04:00