Commit graph

10027 commits

Author SHA1 Message Date
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
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
Michael Kirk 92dd77779c Merge tag '2.32.0.19' 2018-12-03 16:39:06 -05:00
Michael Kirk db3c0c6312 "Bump build to 2.32.0.19." 2018-12-03 16:28:48 -05:00
Michael Kirk 22ae227dac pull latest translations 2018-12-03 16:28:44 -05:00
Michael Kirk 9eeed99708 fix formatting after merge 2018-12-03 16:28:44 -05:00
Michael Kirk 156302acc7 Merge tag '2.31.2.0' into release/2.32.0 2018-12-03 16:24:24 -05:00
Matthew Chen 250bb8dc28 "Bump build to 2.31.2.0." 2018-12-02 17:33:14 -05:00
Matthew Chen e92512f658 Merge branch 'charlesmchen/envelopes' into hotfix/2.31.2 2018-12-02 17:32:43 -05:00
Matthew Chen 0955ab8662 Refine envelope processing. 2018-12-02 17:30:31 -05:00
Michael Kirk f8299a212c "Bump build to 2.32.0.18." 2018-11-30 11:12:50 -07:00
Michael Kirk 21d762f704 sync translations 2018-11-30 11:12:43 -07:00
Michael Kirk 46a44f68f0 Merge branch 'charlesmchen/quotedReplyVsAlbums' into release/2.32.0 2018-11-30 11:07:59 -07:00
Matthew Chen ab9e2c4e11 Ensure quoted replies with attachments are handled properly. 2018-11-30 11:05:55 -07:00
Michael Kirk 68b939d89d Merge branch 'mkirk/splash-screen-changes' into release/2.32.0 2018-11-30 11:01:50 -07:00
Michael Kirk 1ab4ed9aec enable typing indicators directly from splash 2018-11-30 09:20:01 -07:00
Michael Kirk 13da4bc7d0 rename to "primary button" 2018-11-30 09:20:01 -07:00
Matthew Chen 036c6dca41 Merge branch 'release/2.32.0' 2018-11-30 09:30:56 -05:00
Matthew Chen 973afd041d Merge branch 'hotfix/2.31.1' into release/2.32.0 2018-11-30 09:25:34 -05:00
Matthew Chen f9bdf574fb "Bump build to 2.31.1.3." 2018-11-29 18:07:29 -05:00
Matthew Chen 189f3c4c15 Merge branch 'mkirk/empty-message' into hotfix/2.31.1 2018-11-29 18:07:18 -05:00
Michael Kirk 2b43fe31ed verify serialzed message exists 2018-11-29 18:06:59 -05:00
Matthew Chen 4ab37a0f38 Update Cocoapods. 2018-11-29 18:06:40 -05:00
Matthew Chen 8868e0a555 Merge branch 'charlesmchen/backupRestoreFlow' 2018-11-29 15:45:29 -05:00
Matthew Chen 26c337d7ba Add RegistrationController. 2018-11-29 15:45:17 -05:00
Matthew Chen 782fbe656c Add RegistrationController. 2018-11-29 15:45:17 -05:00
Matthew Chen e9bdc4c2c6 Rework backup restore flow. 2018-11-29 15:45:17 -05:00
Matthew Chen 5ce4f4a18c "Bump build to 2.31.1.2." 2018-11-29 15:27:23 -05:00
Matthew Chen eb101e7583 Merge branch 'charlesmchen/udIndicators' into hotfix/2.31.1 2018-11-29 15:27:16 -05:00
Matthew Chen a2dfcd0288 Respond to CR. 2018-11-29 15:00:37 -05:00
Matthew Chen d821bd8e00 Merge branch 'charlesmchen/backupFixes' 2018-11-29 14:49:29 -05:00
Matthew Chen 7624b01d1b Respond to CR. 2018-11-29 14:48:56 -05:00
Matthew Chen c183aeca8e Refine asserts around message sending. 2018-11-29 14:30:16 -05:00
Matthew Chen a6cef1c4cc Update UD indicators. 2018-11-29 14:30:03 -05:00
Matthew Chen d6b107ec18 "Bump build to 2.31.1.1." 2018-11-29 13:40:31 -05:00
Matthew Chen d78371be74 Don't use UD for "self" profile fetches. 2018-11-29 13:37:05 -05:00
Matthew Chen de2917c667 Merge branch 'charlesmchen/ccHeaders' into hotfix/2.31.1 2018-11-29 13:31:22 -05:00
Matthew Chen b290c9a89f Fix headers for censorship circumvention. 2018-11-29 13:31:10 -05:00
Matthew Chen b083d6a94e Merge branch 'charlesmchen/tweakFailover' into hotfix/2.31.1 2018-11-29 13:30:19 -05:00
Matthew Chen 4d1c38cc45 Never failover message sends. 2018-11-29 13:10:40 -05:00
Matthew Chen 0a6d54e8b1 Clean up ahead of CR. 2018-11-29 10:32:27 -05:00
Matthew Chen 4b7b7c19be Clean up. 2018-11-29 09:25:56 -05:00
Matthew Chen 08de701d6e Clean up ahead of CR. 2018-11-29 09:25:04 -05:00
Matthew Chen ca65325710 Don't send messages with restoring attachments. 2018-11-29 09:25:04 -05:00
Matthew Chen 15dc7b2c7c Enable backup after successful backup restore. 2018-11-29 09:25:03 -05:00
Matthew Chen 08cd514e65 Merge branch 'charlesmchen/backupLocalProfile' 2018-11-29 09:17:32 -05:00
Matthew Chen d085520c38 Respond to CR. 2018-11-29 09:17:01 -05:00