Commit Graph

22799 Commits

Author SHA1 Message Date
Matthew Chen
0d5b5bc44c Respond to CR. 2018-01-12 16:49:51 -05:00
Matthew Chen
3de9a4ea55 Add debug UI actions around clearing and snapshotting session state. 2018-01-12 16:42:18 -05:00
Matthew Chen
a1770ec7fc Merge branch 'charlesmchen/robustBackup' 2018-01-12 16:41:09 -05:00
Matthew Chen
05b034e925 Clear out NSUserDefaults during backup restore. 2018-01-12 16:40:57 -05:00
Matthew Chen
67197ddf15 Rename any existing files and directories in restored directories. 2018-01-12 16:40:57 -05:00
Matthew Chen
09032552cf Merge branch 'charlesmchen/dontUseMainApplicationState' 2018-01-12 16:40:16 -05:00
Michael Kirk
56112e79be bump build
// FREEBIE
2018-01-12 15:53:15 -05:00
Michael Kirk
7eb6b1cdd6 Revert submodule update from "Bump version to 2.19.4."
Partial revert of commit e11ac51e31
to remove unintentional submodule update
2018-01-12 15:51:24 -05:00
Matthew Chen
2b528ad894 Don't use mainApplicationState in business logic. 2018-01-12 14:24:35 -05:00
Matthew Chen
b271eab4c7 Merge branch 'charlesmchen/skipRedundantSyncMessages' 2018-01-12 10:36:25 -05:00
Matthew Chen
fec2410ac2 Respond to CR. 2018-01-12 10:36:09 -05:00
Matthew Chen
3f2bee8383 Respond to CR. 2018-01-12 10:36:09 -05:00
Matthew Chen
d81d85c386 Respond to CR. 2018-01-12 10:36:09 -05:00
Matthew Chen
c308e25115 Skip redundant sync messages. 2018-01-12 10:36:09 -05:00
Matthew Chen
a2b67a17fd Skip redundant sync messages. 2018-01-12 10:36:09 -05:00
Matthew Chen
41e6eaeafc Skip redundant sync messages. 2018-01-12 10:36:09 -05:00
Matthew Chen
de4c5e0b17 Merge branch 'charlesmchen/sessionDatabaseRevert2_' 2018-01-12 10:25:13 -05:00
Matthew Chen
76676659f8 Respond to CR. 2018-01-12 10:25:04 -05:00
Matthew Chen
17907dca10 Clean up ahead of PR. 2018-01-12 10:23:54 -05:00
Matthew Chen
15b8e58324 Retain changes from session database branch. 2018-01-12 10:23:54 -05:00
Matthew Chen
76a295aaa5 Merge branch 'charlesmchen/backup' 2018-01-12 10:21:47 -05:00
Michael Kirk
a4cadfecfa bump build
// FREEBIE
2018-01-12 00:55:17 -05:00
Michael Kirk
764b815356 bump build
// FREEBIE
2018-01-12 00:22:52 -05:00
Michael Kirk
9c9734f5a1 Merge branch 'hotfix-2-19-4/fix-zoom' into hotfix/2.19.4 2018-01-12 00:21:33 -05:00
Michael Kirk
63c23b77d0 Cleanup presentation view, feels less blurry
// FREEBIE
2018-01-12 00:17:06 -05:00
Michael Kirk
1ef824029e Fix distorted images
// FREEBIE
2018-01-11 23:58:11 -05:00
Michael Kirk
3582ab42db Fix media detail presentation
- video view now scales during presentation
- no "swooping" when presenting large res images

// FREEBIE
2018-01-11 23:49:21 -05:00
Michael Kirk
7c2bfdfb1f rename: imageView -> mediaView
// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
8851413b35 CR: cleanup, remove debug animation time, move constant
// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
e140ffc423 Fullscreen presentation touchups
"zoom" presentation now accounts for zoomScale.

Fix background flicker as status bar hides
Round corners during presentation/dismiss. Smooths transition a bit.

// FREEBIE
2018-01-11 23:05:59 -05:00
Michael Kirk
d6ea5bad6b Merge branch 'hotfix-2-19-4/fix-content-offset' into hotfix/2.19.4 2018-01-11 23:05:25 -05:00
Michael Kirk
74e03aad01 Fix intermittent content offset problem
Using the CollectionView's frame to determine if we're at the bottom
doesn't make sense unless the collection view is correctly layed out.

// FREEBIE
2018-01-11 23:04:18 -05:00
Matthew Chen
59933ce1d6 Fix rebase breakage. 2018-01-11 11:15:50 -05:00
Matthew Chen
5ba8445f05 Fix rebase breakage. 2018-01-11 10:46:28 -05:00
Matthew Chen
df53033caf Clean up ahead of PR. 2018-01-11 10:44:03 -05:00
Matthew Chen
0422e4252f Clean up ahead of PR. 2018-01-11 10:44:03 -05:00
Matthew Chen
f6296f1fe2 Clean up ahead of PR. 2018-01-11 10:44:03 -05:00
Matthew Chen
16f7317579 Complete backup restore/import. 2018-01-11 10:44:03 -05:00
Matthew Chen
272a90d269 Add import back up UI. Begin work on import backup logic. 2018-01-11 10:42:57 -05:00
Matthew Chen
857ca56ab6 Rework progress mode of export backup UI. 2018-01-11 10:42:27 -05:00
Matthew Chen
980b3d25a7 Rework "export backup" UI. 2018-01-11 10:42:27 -05:00
Matthew Chen
cb4b44b8f4 Lock databases during backup export. 2018-01-11 10:40:49 -05:00
Matthew Chen
b77382f99c Fix security issues in the backup process. 2018-01-11 10:40:49 -05:00
Matthew Chen
2011dae8b6 Show share UI for backups. 2018-01-11 10:40:49 -05:00
Matthew Chen
ea945558c8 Show share UI for backups. 2018-01-11 10:40:49 -05:00
Matthew Chen
2789c0f12c Write backup to encrypted zip. 2018-01-11 10:40:49 -05:00
Matthew Chen
8769fb07cf Write backup to encrypted zip. 2018-01-11 10:40:49 -05:00
Matthew Chen
221a211156 Merge branch 'charlesmchen/saeLookupNonContacts' 2018-01-10 17:58:29 -05:00
Matthew Chen
58e9252689 Let users send to non-contacts, non-threads in SAE. 2018-01-10 17:56:30 -05:00
Matthew Chen
4d6ee9e2de Let users send to non-contacts, non-threads in SAE. 2018-01-10 17:56:30 -05:00