signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity
4,734 Commits 1 Branch 2,246 Tags 1.8 GiB
f9fc23660c
Commit Graph

4734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Chen
f9fc23660c Merge tag '2.18.2.1' 2017-11-07 21:03:21 -05:00
Matthew Chen
40d2e003a4 Bump build to 2.18.2.1. 
// FREEBIE
 2017-11-07 20:39:28 -05:00
Matthew Chen
00752c17a2 Merge branch 'charlesmchen/approveGIFs' into release/2.18.2 2017-11-07 20:36:36 -05:00
Matthew Chen
1f35a1d29c Show attachment approval for GIFs. 
// FREEBIE
 2017-11-07 20:34:52 -05:00
Matthew Chen
957c2e3963 Merge branch 'charlesmchen/attachmentApprovalCrash' into release/2.18.2 2017-11-07 10:47:22 -05:00
Matthew Chen
167a171caf Fix crashes in attachment approval view. 
// FREEBIE
 2017-11-07 09:46:34 -05:00
Michael Kirk
d168485831 Merge branch 'mkirk/update-carthage' 2017-11-07 09:43:52 -05:00
Matthew Chen
511ff83edb Bumped version numbers for hotfix v2.18.2. 
// FREEBIE
 2017-11-06 22:31:47 -05:00
Michael Kirk
28cb7751d8 Update dependencies via Carthage 
Avoid PromiseKit 5 for now.

// FREEBIE
 2017-11-06 19:18:32 -05:00
Matthew Chen
f59f908930 Merge branch 'charlesmchen/burmese' 2017-11-06 16:40:56 -05:00
Matthew Chen
3952f717a5 Add Burmese l10n. 
// FREEBIE
 2017-11-06 15:15:22 -05:00
Matthew Chen
da7338580c Merge tag '2.18.1.0' 2017-11-06 14:28:43 -05:00
Matthew Chen
9c9c63db87 Bumped version numbers for hotfix v2.18.1. 
// FREEBIE
 2017-11-06 13:41:41 -05:00
Michael Kirk
bdc43ac112 Merge branch 'mkirk/group-sync-deadlock' into release/2.18.1 2017-11-06 13:39:49 -05:00
Michael Kirk
e82a3f3ddf respond to CR 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Michael Kirk
8ef9e96b91 Avoid group-sync deadlock by making post-upload save async 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Michael Kirk
98fd15fae7 Avoid groupsync deadlock - pass in transaction 
// FREEBIE
 2017-11-06 13:39:23 -05:00
Matthew Chen
e4d608c61a Merge branch 'charlesmchen/inputToolbarEdge' 2017-11-06 12:54:18 -05:00
Matthew Chen
e3f7947da0 Emphasize borders of input toolbar. 
// FREEBIE
 2017-11-06 12:54:09 -05:00
Matthew Chen
6297663d34 Merge branch 'charlesmchen/multipleLocalNotifications' 2017-11-06 12:51:02 -05:00
Matthew Chen
204902c111 Respond to CR. 
// FREEBIE
 2017-11-06 12:50:20 -05:00
Matthew Chen
03241128f6 Respond to CR. 
// FREEBIE
 2017-11-06 12:37:15 -05:00
Matthew Chen
1ea413ad48 Be more defensive about handling local notifications. 
// FREEBIE
 2017-11-06 11:14:31 -05:00
Matthew Chen
ee4906b952 Merge branch 'charlesmchen/maxTextCellHeight' 2017-11-03 15:48:14 -04:00
Matthew Chen
a5c4140a12 Reduce max text message bubble size. 
// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
ea0b6065e3 Revert "Constrain the max text cell height to the height of the screen." 
This reverts commit b9583a3c85a3b27f65b653a1d851c7c966fdc83d.

// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
608cd2781f Constrain the max text cell height to the height of the screen. 
// FREEBIE
 2017-11-03 15:48:08 -04:00
Matthew Chen
0cd49e597e Merge branch 'charlesmchen/ensureAttachmentContentType' 2017-11-03 15:24:29 -04:00
Matthew Chen
8b6265f1b5 Respond to CR. 
// FREEBIE
 2017-11-03 15:24:22 -04:00
Matthew Chen
4d57402367 Ensure attachments always have a valid content type. 
// FREEBIE
 2017-11-03 15:03:17 -04:00
Matthew Chen
5548030bde Merge branch 'charlesmchen/messageStatusBias' 2017-11-03 14:41:49 -04:00
Matthew Chen
2b8fc59a8f Respond to CR. 
// FREEBIE
 2017-11-03 14:40:47 -04:00
Matthew Chen
74854dd788 Tweak biases of the message status logic. 
// FREEBIE
 2017-11-03 14:24:13 -04:00
Matthew Chen
365e984b7a Tweak biases of the message status logic. 
// FREEBIE
 2017-11-03 14:24:13 -04:00
Matthew Chen
e07a240ee5 Merge tag '2.18.0.9' 2017-11-03 14:23:47 -04:00
Matthew Chen
384d3b201f Bump build to 2.18.0.9. 
// FREEBIE
 2017-11-03 13:55:33 -04:00
Matthew Chen
7fc960fefa Merge branch 'mkirk/re-redux-pki' into release/2.18.0 2017-11-03 13:55:21 -04:00
Michael Kirk
81cff837ae Include root certs from pki.goog 
// FREEBIE
 2017-11-03 13:55:12 -04:00
Matthew Chen
92557bf3ef Bump build to 2.18.0.8. 
// FREEBIE
 2017-11-03 11:57:30 -04:00
Michael Kirk
80f91dcf5f Merge branch 'mkirk/censorship-circumvention-redux' into release/2.18.0 2017-11-03 11:56:17 -04:00
Michael Kirk
6c13d46be2 use manually specified censorship host 
// FREEBIE
 2017-11-03 11:24:57 -04:00
Michael Kirk
39e3e9b44f use .com when in US 
// FREEBIE
 2017-11-03 11:24:57 -04:00
Michael Kirk
11e07370a9 more logging 
// FREEBIE
 2017-11-03 11:24:57 -04:00
Michael Kirk
a30533e7b5 Add GTSGIAG3 to censorship circumvention trust store 
openssl x509 -outform der -in GIAG3.pem -out GIAG3.crt

// FREEBIE
 2017-11-03 11:24:57 -04:00
Matthew Chen
4037e2ee39 Merge tag '2.18.0.7' 2017-11-02 17:21:17 -04:00
Matthew Chen
6037477c46 Bump build to 2.18.0.7. 
// FREEBIE
 2017-11-02 17:15:34 -04:00
Matthew Chen
3db87d74c2 Merge branch 'mkirk/reduce-debounce-time' into release/2.18.0 2017-11-02 17:15:29 -04:00
Michael Kirk
ef80b53ff8 Merge branch 'mkirk/debug-reregister' 2017-11-02 16:06:03 -04:00
Michael Kirk
295646e5fa Rebase cleanup 
// FREEBIE
 2017-11-02 16:05:41 -04:00
Michael Kirk
0706edf42a Generate new registrationId on re-register 
In order for others to know they should start a new session with us, we
need to change our registration id.

To achieve this, I consolidated all the Account related attributes on
TSAccountManager - luckily they were already in the proper collection, I
just moved the API to hang on the AccountManager instead of a TSStorage
category extension.

Also:

@synchronize access to `registrationId`

// FREEBIE
 2017-11-02 16:05:41 -04:00