Commit graph

5307 commits

Author SHA1 Message Date
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
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
Matthew Chen
9e89502fdb Let users send to non-contacts, non-threads in SAE. 2018-01-10 17:56:30 -05:00
Matthew Chen
49fc302294 Merge branch 'charlesmchen/sessionDatabaseRevert_' 2018-01-10 17:56:07 -05:00
Matthew Chen
89c7ebf74b Respond to CR. 2018-01-10 17:55:56 -05:00
Matthew Chen
bf3f5dd141 Respond to CR. 2018-01-10 17:51:05 -05:00
Matthew Chen
77572bdaec Retain changes from session database branch. 2018-01-10 12:36:23 -05:00
Matthew Chen
1839b10550 Retain changes from session database branch. 2018-01-10 12:18:34 -05:00
Matthew Chen
9ac2383a2c Retain changes from session database branch. 2018-01-10 12:18:29 -05:00
Matthew Chen
e77c3e6717 Retain changes from session database branch. 2018-01-10 12:18:23 -05:00
Matthew Chen
b8c6d29170 Merge branch 'charlesmchen/storageReset' 2018-01-08 10:52:14 -05:00
Matthew Chen
d01ec57f0e Fix storage reset. 2018-01-08 10:51:56 -05:00
Matthew Chen
23693c8ced Merge branch 'charlesmchen/sendDatabase' 2018-01-04 11:05:01 -05:00
Matthew Chen
3a9886bb2b Send database action in debug UI. 2018-01-04 10:50:33 -05:00
sdkjfhsdkjhfsdlkjhfsdf
eefd66e4a6 Merge branch 'mkirk/sharing-vs-sn' 2018-01-02 13:17:26 -06:00
sdkjfhsdkjhfsdlkjhfsdf
3a6ddd4bf8 CR: cleanup
// FREEBIE
2018-01-02 11:24:36 -06:00
sdkjfhsdkjhfsdlkjhfsdf
6e2d9c8141 identity change vs. share extension
// FREEBIE
2018-01-02 11:24:36 -06:00
sdkjfhsdkjhfsdlkjhfsdf
6b5883dc10 Don't resize attachment view when switching between alerts.
// FREEBIE
2018-01-02 11:24:36 -06:00
sdkjfhsdkjhfsdlkjhfsdf
697fc4ff4b Merge branch 'mkirk/fix-message-detail-view' 2017-12-22 22:43:35 -06:00
sdkjfhsdkjhfsdlkjhfsdf
46930b9354 Fix crash when viewing non-attachment message details.
// FREEBIE
2017-12-22 22:41:03 -06:00
sdkjfhsdkjhfsdlkjhfsdf
3b17c43e8b Merge branch 'mkirk/fix-profile-flicker' 2017-12-22 13:58:13 -06:00
sdkjfhsdkjhfsdlkjhfsdf
4e6816ec5e Code cleanup
// FREEBIE
2017-12-22 13:55:05 -06:00
sdkjfhsdkjhfsdlkjhfsdf
14723f3e7f Fix profile avatar flicker
- We were clobbering our saved avatar filepath.
- Our "should notify" check was too aggressive.
- Only fetch profiles when entering a conversation.
- Only fetch profiles in main app

Also added (a little) debounce time to debug profile fetching.

// FREEBIE
2017-12-21 19:34:45 -06:00
sdkjfhsdkjhfsdlkjhfsdf
34d2df8d67 Merge branch 'mkirk/attachment-progress' 2017-12-21 10:38:18 -06:00
sdkjfhsdkjhfsdlkjhfsdf
01fa3c89cc CR: cleanup comments, extract callback into method
// FREEBIE
2017-12-21 10:36:42 -06:00
sdkjfhsdkjhfsdlkjhfsdf
b87079d4b4 Sharing attachment shows progress / retry dialog
// FREEBIE
2017-12-20 20:57:17 -06:00
sdkjfhsdkjhfsdlkjhfsdf
37ee9f0e7f Merge branch 'mkirk/attachment-caption' 2017-12-20 16:59:13 -06:00
sdkjfhsdkjhfsdlkjhfsdf
42ea1dfbbe CR: more margin, match button size to default text field, fix layout
when rotated.

There was an issue with captions changing line-count when rotated.

// FREEBIE
2017-12-20 16:58:51 -06:00
sdkjfhsdkjhfsdlkjhfsdf
8141843f27 comment typo 2017-12-20 14:26:53 -06:00
sdkjfhsdkjhfsdlkjhfsdf
7907a64dfe move gradient up with keyboard
// FREEBIE
2017-12-20 14:26:53 -06:00