Commit Graph

10072 Commits

Author SHA1 Message Date
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
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
Matthew Chen
e45b27bb28 Stop lazy attachment restore during backup import. 2018-12-03 22:54:06 -05:00
Matthew Chen
cafc732dcb Fix incremental backup exports. 2018-12-03 22:54:06 -05:00
Matthew Chen
ada0ea9997 Merge branch 'charlesmchen/ignoreLocalProfileRestoreFailures' 2018-12-03 22:53:17 -05:00
Matthew Chen
e8ddc041dd Respond to CR. 2018-12-03 22:52:50 -05:00
Matthew Chen
0a4f004935 Ignore local profile restore failures. 2018-12-03 22:46:57 -05:00
Matthew Chen
c3704931ec Fix incremental backup exports. 2018-12-03 22:46:57 -05:00
Matthew Chen
a1bb5fa43f Merge branch 'charlesmchen/fixIncrementalBackups' 2018-12-03 22:41:41 -05:00
Matthew Chen
7506d93eaf Respond to CR. 2018-12-03 22:41:08 -05:00
Matthew Chen
f6b5a9eecc Fix incremental backup exports. 2018-12-03 22:21:59 -05:00
Matthew Chen
e26eb5459a Fix incremental backup exports. 2018-12-03 22:21:59 -05:00
Matthew Chen
9a123d8ce9 Fix incremental backup exports. 2018-12-03 22:21:59 -05:00
Matthew Chen
fe8259bf0c Fix incremental backup exports. 2018-12-03 22:21:59 -05:00
Matthew Chen
d70aa4418f Merge branch 'release/2.32.0' 2018-12-03 22:20:50 -05:00
Matthew Chen
c8cf5e01a7 Merge branch 'charlesmchen/attachmentRestore' 2018-12-03 22:18:29 -05:00
Matthew Chen
52f52a94a2 Respond to CR. 2018-12-03 22:18:09 -05:00
Matthew Chen
cb349ad0fe Fix local profile restore. 2018-12-03 22:06:38 -05:00
Matthew Chen
894fd1379c Fix spurious assert. 2018-12-03 22:06:38 -05:00
Matthew Chen
ee74691e80 Activate lazy restore of attachments. 2018-12-03 22:06:38 -05:00
Matthew Chen
998c079e6a Account for local profile avatar item in backup cleanup. 2018-12-03 22:06:38 -05:00
Matthew Chen
02150efa27 Fix assert in backup import. 2018-12-03 22:06:38 -05:00
Matthew Chen
f7842dd2aa Rework lazy attachment restore. 2018-12-03 22:06:38 -05:00
Matthew Chen
3bff89c7ee Fix cancel in backup restore view. 2018-12-03 22:06:38 -05:00
Matthew Chen
7e77a69f86 Improve backup logging. 2018-12-03 22:06:38 -05:00
Matthew Chen
151b339339 Merge branch 'charlesmchen/explicitBackupFeatureFlag' into release/2.32.0 2018-12-03 22:05:26 -05:00
Matthew Chen
4ea920e89f Add explicit feature flag for backup. 2018-12-03 22:05:07 -05:00
Matthew Chen
58b36d18ac Merge branch 'charlesmchen/tweakProfilesDebugUI' into release/2.32.0 2018-12-03 22:02:32 -05:00
Matthew Chen
aa4fea64cf Improve Profiles Debug UI. 2018-12-03 22:02:03 -05:00
Michael Kirk
e0f20bc8d5 "Bump build to 2.33.0.4." 2018-12-03 16:44:37 -05:00
Michael Kirk
96c472cfc5 update info.plist 2018-12-03 16:44:23 -05:00