Commit graph

9887 commits

Author SHA1 Message Date
Michael Kirk dbe8e5706d avoid crash on iOS9/10 2018-11-21 22:26:59 -06:00
Michael Kirk 9483566ef7 Merge branch 'mkirk/fix-video-play-button-in-gallery' into release/2.32.0 2018-11-21 22:26:31 -06:00
Michael Kirk 343e58595e fix pause/play functionality 2018-11-21 22:26:13 -06:00
Matthew Chen af61418b0e Merge branch 'charlesmchen/restoreWithAttachmentPointers' 2018-11-21 09:26:26 -08:00
Matthew Chen de6c058acd Update Cocoapods. 2018-11-21 09:26:02 -08:00
Matthew Chen 5f8755f2eb Respond to CR. 2018-11-21 09:25:24 -08:00
Matthew Chen f5ba8048b7 Clean up ahead of PR. 2018-11-21 08:53:15 -08:00
Matthew Chen d76bdf3a58 Use attachment pointers to restore attachments from backup. 2018-11-21 08:53:15 -08:00
Matthew Chen e72dafb08e Use attachment pointers to restore attachments from backup. 2018-11-21 08:53:15 -08:00
Matthew Chen 90e7df5515 Use attachment pointers to restore attachments from backup. 2018-11-21 08:53:15 -08:00
Matthew Chen 7425f7f413 Merge branch 'charlesmchen/rekindleBackup' 2018-11-19 15:52:37 -05:00
Matthew Chen dae80ad4c6 Reorganize util code. 2018-11-19 15:52:23 -05:00
Matthew Chen 88026be429 Merge branch 'release/2.32.0' 2018-11-19 14:49:59 -05:00
Matthew Chen bfbf9d39ad Update Cocoapods. 2018-11-19 14:43:27 -05:00
Matthew Chen f7df229fc0 Merge tag '2.31.0.39' into release/2.32.0 2018-11-19 14:41:05 -05:00
Michael Kirk 80f611c4db Merge branch 'mkirk/remove-message-author-id' 2018-11-19 13:01:33 -06:00
Michael Kirk 0d0359ee12 Fix crash due to empty authorId on old messages 2018-11-19 13:01:24 -06:00
Michael Kirk 7b3bf8636a Merge branch 'mkirk/simplify-dependency-documentation' 2018-11-19 13:00:43 -06:00
Matthew Chen 221d280e41 "Bump build to 2.31.0.39." 2018-11-19 13:18:55 -05:00
Matthew Chen 128ec66481 Merge branch 'charlesmchen/unregisteredAccountAttributesUpdate' into release/2.31.0 2018-11-19 13:18:45 -05:00
Matthew Chen 4d2bbfc54d Fix crash around account attributes update when unregistered. 2018-11-19 13:10:59 -05:00
Michael Kirk f6d78d04b5 removed outdated build instructions. 2018-11-19 11:45:26 -06:00
Michael Kirk 1df55c70fe Merge branch 'mkirk/update-deps' 2018-11-19 09:56:42 -06:00
Michael Kirk e28eb330e0 bundle update 2018-11-19 09:56:18 -06:00
Michael Kirk 4db5df4bff pod update 2018-11-19 09:56:14 -06:00
Michael Kirk b87b2522e3 Merge tag '2.32.0.13' 2018-11-16 23:28:51 -06:00
Michael Kirk dc3cc3f403 "Bump build to 2.32.0.13." 2018-11-16 17:44:32 -06:00
Michael Kirk 8932c4a3f1 Sync translations 2018-11-16 17:44:22 -06:00
Michael Kirk 6935761ab9 Merge tag '2.31.0.38' into release/2.32.0 2018-11-16 17:32:02 -06:00
Michael Kirk 9a7f08b70b "Bump build to 2.31.0.38." 2018-11-16 17:25:11 -06:00
Michael Kirk eb85684ba0 Merge branch 'mkirk/ud-error-handling' into release/2.31.0 2018-11-16 17:23:08 -06:00
Michael Kirk f52a58e31e Handle known sender 2018-11-16 17:22:40 -06:00
Michael Kirk 6c2dbbc7c3 verify envelope source before proceeding with error handling 2018-11-16 10:32:02 -06:00
Michael Kirk dc09d14733 "Bump build to 2.32.0.12." 2018-11-15 21:31:09 -06:00
Michael Kirk 715c9f19d8 Merge remote-tracking branch 'origin/charlesmchen/multipleLoadMore' into release/2.32.0 2018-11-15 21:30:18 -06:00
Matthew Chen 0bbfd3eb2d "Auto load more" async while scrolling. 2018-11-15 22:03:28 -05:00
Matthew Chen 910b249112 "Auto load more" async while scrolling. 2018-11-15 22:02:59 -05:00
Matthew Chen 6c9c8eb656 Fix build breaks. 2018-11-15 18:16:38 -05:00
Michael Kirk 377e0f0f87 "Bump build to 2.32.0.11." 2018-11-15 15:08:57 -06:00
Michael Kirk 5e14230850 Merge branch 'mkirk/dark-theme-splash' into release/2.32.0 2018-11-15 15:08:45 -06:00
Michael Kirk 12aa76855d dark theme typing splash 2018-11-15 15:07:59 -06:00
Michael Kirk 8acc13e44d "Bump build to 2.32.0.10." 2018-11-15 14:34:44 -06:00
Michael Kirk 8ba028073e update pods 2018-11-15 14:34:26 -06:00
Michael Kirk a94ce98553 Merge branch 'mkirk/fix-delete-share' into release/2.32.0 2018-11-15 14:33:30 -06:00
Michael Kirk bf21e94256 fix delete/share button 2018-11-15 14:30:46 -06:00
Michael Kirk f5de076c66 fix remove from rail when deleted 2018-11-15 14:30:33 -06:00
Michael Kirk 078799c875 update translations 2018-11-15 14:07:36 -06:00
Matthew Chen d325d02d78 Merge branch 'charlesmchen/imagePickerAddMore' 2018-11-15 14:12:01 -05:00
Matthew Chen 8eb2550e0c Respond to CR. 2018-11-15 14:10:19 -05:00
Matthew Chen 8b24fba095 Add "add more" button to image picker. Provide caption editing continuity. 2018-11-15 14:10:19 -05:00