oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
10043 commits 5 branches 133 tags 218 MiB
Commit graph

10043 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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