Commit Graph

13649 Commits

Author SHA1 Message Date
Nora Trapp
ccaa4e0e90 Fix avatar contact name when is disabled 2019-09-03 12:12:13 -07:00
Nora Trapp
d5152c946b Merge branch 'nt/fixups' into release/2.42.0 2019-08-30 19:22:56 -07:00
Nora Trapp
eb9b0313ef Ensure the desired keyboard state is updated after interactive dismissal 2019-08-30 12:46:35 -07:00
Matthew Chen
ffef2b5570 "Bump build to 2.42.0.17." 2019-08-30 16:06:05 -03:00
Matthew Chen
fc135e4298 Update l10n strings. 2019-08-30 16:06:02 -03:00
Nora Trapp
b6487aa892 Merge branch 'nt/fixups' into release/2.42.0 2019-08-30 12:00:10 -07:00
Nora Trapp
212cdf368a Fix attachment keyboard display after permission dialog 2019-08-30 15:31:00 -03:00
Matthew Chen
6d103bfa84 Merge branch 'charlesmchen/revertCameraButton' into release/2.42.0 2019-08-30 14:55:45 -03:00
Matthew Chen
7868f2d778 Revert camera button changes in "camera roll" view. 2019-08-30 14:54:22 -03:00
Nora Trapp
b17ec7e99c Merge branch 'nt/fixups' into release/2.42.0 2019-08-30 10:46:34 -07:00
Nora Trapp
d382caa565 Show gif / video badge in attachment keyboard 2019-08-29 22:58:42 -07:00
Nora Trapp
49a40de98e Fix location picker header on iOS 13.1 2019-08-29 22:40:37 -07:00
Nora Trapp
b71a499ec6 Fix peek interactions with keyboard measurement. 2019-08-29 22:28:01 -07:00
Matthew Chen
c026575cc7 "Bump build to 2.42.0.16." 2019-08-29 18:39:18 -03:00
Matthew Chen
e159ec4116 Merge branch 'nt/block-list-fix' into release/2.42.0 2019-08-29 18:38:58 -03:00
Nora Trapp
55f53dc246 Fix crash when blocking user's with UUIDs 2019-08-29 18:38:38 -03:00
Matthew Chen
197a19912d "Bump build to 2.42.0.15." 2019-08-29 14:44:42 -03:00
Nora Trapp
0c69664da9 Fix missing import 2019-08-29 10:30:08 -07:00
Nora Trapp
e8ba4bb536 Merge branch 'nt/profile-changes' into release/2.42.0 2019-08-29 10:18:32 -07:00
Nora Trapp
b45516839f Restore old ~profile display 2019-08-29 10:18:12 -07:00
Nora Trapp
7f240f655e Merge branch 'nt/profile-feature-flags' into release/2.42.0 2019-08-29 10:15:55 -07:00
Nora Trapp
686e439106 Restore contact offer 2019-08-29 10:15:30 -07:00
Nora Trapp
85beb08bde Put message request view behind a feature flag 2019-08-29 10:15:30 -07:00
Matthew Chen
d845ccd61b Respond to PR. 2019-08-29 09:34:03 -03:00
Matthew Chen
c7f6e9d318 Commit to PR. 2019-08-29 09:13:15 -03:00
Matthew Chen
b29a7f449d "Bump build to 2.42.0.14." 2019-08-28 10:35:17 -03:00
Matthew Chen
555852fcdd Merge branch 'charlesmchen/tsAccountManagerDeadlocks' into release/2.42.0 2019-08-28 10:33:59 -03:00
Matthew Chen
4f950e83f8 Avoid deadlock in TSAccountManager. 2019-08-28 10:33:26 -03:00
Matthew Chen
127c0716a3 Revert "Avoid deadlock in TSAccountManager."
This reverts commit 3441c930804b428d142a51a8b34b2ce6daecee6f.
2019-08-28 10:33:26 -03:00
Matthew Chen
2c03fda4ca Avoid deadlock in TSAccountManager. 2019-08-28 10:33:26 -03:00
Matthew Chen
624de96500 Avoid deadlocks in ts account manager around uuid key. 2019-08-28 10:33:26 -03:00
Matthew Chen
f4c7d27eee "Bump build to 2.42.0.13." 2019-08-27 18:44:03 -03:00
Matthew Chen
238029594e Fix build warnings; add comment. 2019-08-27 17:39:09 -03:00
Matthew Chen
9e66e720af Merge branch 'charlesmchen/groupNameVsTests' into release/2.42.0 2019-08-27 17:32:21 -03:00
Matthew Chen
d6c7922f32 Fix tests broken by "group name" changes. 2019-08-27 17:30:08 -03:00
Matthew Chen
26d1fabba5 Update CocoaLumberjack pod. 2019-08-27 16:57:49 -03:00
Matthew Chen
80b2167cce Update SignalMetadataKit pod. 2019-08-27 16:40:57 -03:00
Matthew Chen
9281491508 "Bump build to 2.42.0.12." 2019-08-27 16:12:03 -03:00
Matthew Chen
2f660997e8 Update l10n strings. 2019-08-27 16:12:01 -03:00
Matthew Chen
00f610241f Set feature flags for beta. 2019-08-27 16:08:15 -03:00
Matthew Chen
d325627d85 Merge branch 'charlesmchen/expireUndownloadedMessages' into release/2.42.0 2019-08-27 15:59:45 -03:00
Matthew Chen
338005464d Expire messages even if they haven't finished downloading. 2019-08-27 15:53:20 -03:00
Matthew Chen
583e29c122 Merge branch 'charlesmchen/emptyInboxVsLocalAddress' into release/2.42.0 2019-08-27 15:42:39 -03:00
Matthew Chen
1626a5ca89 Fix 'empty inbox v. local address.' issue. 2019-08-27 15:41:02 -03:00
Matthew Chen
2bffc5e8c7 Merge branch 'charlesmchen/stickyKeyboard2' into release/2.42.0 2019-08-27 15:26:54 -03:00
Matthew Chen
cd88f4f012 Address sticky keyboards on iOS 12. 2019-08-27 14:50:29 -03:00
Matthew Chen
e5b7e7989c Merge branch 'charlesmchen/syncContactsMore' into release/2.42.0 2019-08-27 14:07:16 -03:00
Matthew Chen
a422d0cb26 Flush pending contact syncs. 2019-08-27 14:06:43 -03:00
Matthew Chen
dafa022e59 Merge branch 'charlesmchen/removeRedundantCameraButton' into release/2.42.0 2019-08-27 14:02:43 -03:00
Matthew Chen
5fcfadcf09 Remove redundant camera button. 2019-08-27 14:02:36 -03:00