Commit Graph

10101 Commits

Author SHA1 Message Date
Michael Kirk
d29763acf2 Merge branch 'mirk/attachment-approval-placeholder' 2018-12-10 10:04:10 -07:00
Michael Kirk
3e48ed105d keyboard is always dark in attachment approval 2018-12-10 10:04:01 -07:00
Michael Kirk
2f92995cd6 Add placeholder text to message input field 2018-12-10 10:04:01 -07:00
Michael Kirk
800994f106 Merge branch 'mkirk/fix-draft-scrolling' 2018-12-10 10:03:15 -07:00
Michael Kirk
52e21be656 fix draft scrolling 2018-12-10 10:03:01 -07:00
Matthew Chen
19d76ac95d Merge branch 'charlesmchen/conversationViewScrollDown' 2018-12-10 09:24:32 -05:00
Matthew Chen
00c6ed2f3c Tweak scroll down animation behavior in conversation view. 2018-12-10 09:24:18 -05:00
Matthew Chen
6f6ce86abd Merge branch 'charlesmchen/cloudKitNotificationThreadSafety' 2018-12-10 09:22:58 -05:00
Matthew Chen
734cc22cb3 Fix thread safety around CloudKit notifications. 2018-12-10 09:22:45 -05:00
Matthew Chen
d5b2b2cdd3 Merge branch 'charlesmchen/lazyRestoreVsAppReadiness' 2018-12-07 16:46:22 -05:00
Matthew Chen
c646dbc560 Deconflict lazy restore and app readiness. 2018-12-07 16:46:13 -05:00
Matthew Chen
0b03f275e2 Merge branch 'charlesmchen/refineConversationDeleteAndArchive' 2018-12-07 16:45:45 -05:00
Matthew Chen
02c7a52a64 Refine conversation delete/archive. 2018-12-07 16:45:33 -05:00
Michael Kirk
9eb0c5e773 Merge branch 'release/2.32.0' 2018-12-07 14:33:22 -05:00
Michael Kirk
d0f68177f1 "Bump build to 2.32.0.23." 2018-12-07 13:44:32 -05:00
Michael Kirk
1328191a19 log transcript timestamp 2018-12-07 13:44:22 -05:00
Michael Kirk
eb96eec94a Merge branch 'release/2.32.0' 2018-12-07 09:55:43 -05:00
Matthew Chen
faa6b3e4a5 Merge branch 'charlesmchen/timerIcons' 2018-12-07 09:15:11 -05:00
Matthew Chen
92ed5f54a4 Update timer icons. 2018-12-07 09:14:56 -05:00
Matthew Chen
d48cc08237 Merge branch 'charlesmchen/darkThemeVsMediaDownloads' 2018-12-07 09:12:44 -05:00
Matthew Chen
b88416a931 Apply dark theme changes to media downloads. 2018-12-07 09:12:31 -05:00
Michael Kirk
973390099a "Bump build to 2.32.0.22." 2018-12-06 19:51:50 -05:00
Michael Kirk
870f0903f7 Merge branch 'mkirk/landscape-bug' into release/2.32.0 2018-12-06 19:48:39 -05:00
Michael Kirk
e834550649 ensure layout invalidated after leaving media landscape 2018-12-06 19:48:32 -05:00
Michael Kirk
2d3e34030f Merge branch 'mkirk/fix-settings-accessibility' into release/2.32.0 2018-12-06 19:47:42 -05:00
Michael Kirk
34737567c2 fix voice over for settings bar button item 2018-12-06 19:45:20 -05:00
Michael Kirk
7845b26d76 Merge branch 'mkirk/logging' into release/2.32.0 2018-12-06 19:45:04 -05:00
Michael Kirk
5423607393 debug logging 2018-12-06 19:12:52 -05:00
Michael Kirk
3d9e27ff64 "Bump build to 2.32.0.21." 2018-12-05 16:43:24 -05:00
Michael Kirk
b0bd0ecb3b "Bump build to 2.32.0.20." 2018-12-05 16:43:20 -05:00
Michael Kirk
ac012ac59f Merge branch 'charlesmchen/typingIndicatorsBug2' into release/2.32.0 2018-12-05 14:38:19 -05:00
Matthew Chen
4f0fa23c4f Don't ever show TI when they are disabled. 2018-12-05 14:38:10 -05:00
Matthew Chen
eda7d6b458 Update 'tags to ignore.' 2018-12-05 14:13:26 -05:00
Michael Kirk
694b9ef7e9 Merge tag '2.32.0.20' 2018-12-05 14:08:02 -05:00
Michael Kirk
e5f99b9d64 "Bump build to 2.32.0.20." 2018-12-05 14:06:29 -05:00
Michael Kirk
eb613c87c3 Merge branch 'mkirk/limit-attachments' 2018-12-05 13:56:46 -05:00
Michael Kirk
f8e073f09a enforce attachment limit in photo picker 2018-12-05 13:56:34 -05:00
Michael Kirk
de73c220da increment version canary 2018-12-05 13:56:34 -05:00
Michael Kirk
1a5c47df2f Fix SAE, limit max attachments 2018-12-05 13:56:34 -05:00
Matthew Chen
9921a6fe46 Merge branch 'charlesmchen/typingIndicatorsBug' into release/2.32.0 2018-12-05 13:32:10 -05:00
Matthew Chen
6e457e43ca Clear typing indicators when they are disabled. 2018-12-05 13:31:54 -05:00
Matthew Chen
f7e0448f1b Merge branch 'charlesmchen/batchBackupTransfers' 2018-12-05 10:02:48 -05:00
Matthew Chen
304f0824fe Respond to CR. 2018-12-05 10:00:36 -05:00
Matthew Chen
8811c61d28 Respond to CR. 2018-12-03 23:03:50 -05:00
Matthew Chen
855cba3c41 Batch backup exports. 2018-12-03 23:01:48 -05:00
Matthew Chen
57205facbc Batch backup exports. 2018-12-03 23:01:48 -05:00
Matthew Chen
c1ac5c1872 Batch backup exports. 2018-12-03 23:01:48 -05:00
Matthew Chen
163c467480 Fix incremental backup exports. 2018-12-03 23:00:52 -05:00
Matthew Chen
607620911e Merge branch 'charlesmchen/lazyRestoreVsBackupImport' 2018-12-03 23:00:08 -05:00
Matthew Chen
019a4d5805 Respond to CR. 2018-12-03 22:59:41 -05:00