Commit Graph

10174 Commits

Author SHA1 Message Date
Matthew Chen
5568482e4c "Bump build to 2.33.1.0." 2019-01-10 17:16:25 -05:00
Matthew Chen
cc4d85a91e Encrypted device names. 2019-01-10 17:12:29 -05:00
Matthew Chen
74274e58de "Bump build to 2.33.0.12." 2019-01-02 17:28:27 -05:00
Matthew Chen
3cd31c6c53 "Bump build to 2.33.0.11." 2019-01-02 16:43:14 -05:00
Matthew Chen
43527ac731 Merge branch 'mkirk/fix-view-model-update' into release/2.33.0 2019-01-02 16:43:06 -05:00
Michael Kirk
049b858125 Fix crash when update corresponds to a move.
reloading during performBatchUpdates requires the *original* indexPath, not the
new index path.
2019-01-02 16:42:48 -05:00
Matthew Chen
badc959e66 Update l10n. 2019-01-02 16:42:35 -05:00
Matthew Chen
3d6b9e1dc3 Fix build warning. 2019-01-02 16:41:03 -05:00
Michael Kirk
00f5e4d3ef Merge tag '2.32.2.0' into release/2.33.0 2019-01-02 10:48:13 -07:00
Michael Kirk
b0318f59d1 Merge branch 'mkirk/sae-crash' into hotfix/2.32.2 2018-12-20 12:38:42 -07:00
Michael Kirk
f27d0ef992 Fix SAE crash 2018-12-20 12:35:15 -07:00
Michael Kirk
9da8d1ac3f "Bump build to 2.32.2.0." 2018-12-20 12:35:01 -07:00
Michael Kirk
21a910d93f "Bump build to 2.33.0.10." 2018-12-19 09:48:54 -07:00
Michael Kirk
c4e21c641c Sync translations 2018-12-19 09:48:47 -07:00
Matthew Chen
6fe33ab806 Merge branch 'charlesmchen/typingIndicatorsVsBlockAndLeftGroup' into release/2.33.0 2018-12-18 16:24:15 -05:00
Matthew Chen
4e0cfac911 Respond to CR. 2018-12-18 16:24:06 -05:00
Matthew Chen
07fef16155 Discard typing indicators for blocked and left groups. 2018-12-18 16:24:06 -05:00
Matthew Chen
1f6b184136 Merge branch 'charlesmchen/mpgVideo' into release/2.33.0 2018-12-18 16:21:24 -05:00
Matthew Chen
fa9af6c923 Try to play .mpg videos. 2018-12-18 14:54:05 -05:00
Michael Kirk
19d0119c6e Merge branch 'mkirk/fix-photo-picker-ios10' into release/2.33.0 2018-12-17 09:45:38 -07:00
Michael Kirk
fcea9f07b0 Fix hang on iOS10.
Offsetting by a large number was a work-around to the late assignment of
safeAreaInsets.

Before iOS11, safeAreaInsets didn't exist, and contentInsets are set *before*
viewDidAppear, so this workaround wasn't relevant.
2018-12-17 09:44:39 -07:00
Michael Kirk
e4d924d288 Merge tag '2.32.1.0' into release/2.33.0 2018-12-14 11:49:28 -07:00
Michael Kirk
31a1fe10c7 "Bump build to 2.32.1.0." 2018-12-14 11:13:09 -07:00
Michael Kirk
1a7127a750 Merge branch 'mkirk/fix-caption' into hotfix/2.32.1 2018-12-14 11:12:16 -07:00
Michael Kirk
cf48fb3076 Don't use caption field 2018-12-14 11:03:54 -07:00
Michael Kirk
f9c083c694 "Bump build to 2.33.0.9." 2018-12-12 12:19:59 -07:00
Michael Kirk
3ee1c078fc Merge branch 'charlesmchen/dbConnForOrphanDataCleaner' 2018-12-12 12:19:51 -07:00
Matthew Chen
95bc7a23f7 Use dedicated db connection in orphan data cleaner. 2018-12-12 14:14:09 -05:00
Michael Kirk
ada1f1ae12 "Bump build to 2.33.0.8." 2018-12-12 10:08:56 -07:00
Michael Kirk
6ece45a2e4 toggle multisend feature flag 2018-12-12 10:08:22 -07:00
Michael Kirk
a6a51813e0 "Bump build to 2.33.0.7." 2018-12-12 09:25:55 -07:00
Michael Kirk
1bc81ad76e Merge branch 'mkirk/group-soft-delete' 2018-12-12 09:06:53 -07:00
Michael Kirk
425bdd7a4f guard against edge case
Though, I don't think this method should ever be called when localNumber is
nil.
2018-12-12 09:05:41 -07:00
Michael Kirk
c8c932033b add proper nullability annotation 2018-12-12 09:05:27 -07:00
Michael Kirk
beb02afce9 Soft delete group threads 2018-12-12 08:46:15 -07:00
Michael Kirk
c0cb7df10a rename hasEverHadMessage -> shouldThreadBeVisible 2018-12-12 08:46:15 -07:00
Michael Kirk
4ac93276c6 sync translations 2018-12-11 16:27:39 -07:00
Michael Kirk
70f826799d "Bump build to 2.33.0.6." 2018-12-11 16:25:34 -07:00
Matthew Chen
823a6d9e07 Merge branch 'charlesmchen/finalizeOrphanCleanup' 2018-12-11 16:35:35 -05:00
Matthew Chen
af3cff3399 Prep orphan data cleaner. 2018-12-11 16:35:28 -05:00
Matthew Chen
8ba747916a Prep orphan data cleaner. 2018-12-11 16:35:28 -05:00
Michael Kirk
585ed0c31f Merge branch 'mkirk/moreRetainUntilComplete' 2018-12-11 09:38:15 -07:00
Michael Kirk
b7ab036c04 warn_unused_result on AnyPromise methods 2018-12-11 09:37:44 -07:00
Matthew Chen
a29db6cb52 Merge branch 'charlesmchen/moreRetainUntilComplete' 2018-12-11 10:46:13 -05:00
Matthew Chen
acd97602ca Respond to CR. 2018-12-11 10:46:01 -05:00
Matthew Chen
48bd0cfa06 Add missing retains to promises. 2018-12-11 10:43:47 -05:00
Matthew Chen
222e07c5bd Merge branch 'charlesmchen/moreBackupFeatureFlag' 2018-12-11 10:42:56 -05:00
Matthew Chen
15653498b7 Apply backup feature flag. 2018-12-11 10:05:18 -05:00
Michael Kirk
f68c410bcf "Bump build to 2.33.0.5." 2018-12-10 13:21:25 -07:00
Michael Kirk
af25225169 Merge branch 'mkirk/order-photo-collections' 2018-12-10 13:13:49 -07:00