Commit graph

9799 commits

Author SHA1 Message Date
Michael Kirk 894ffa4845 "Bump build to 2.32.0.15." 2018-11-24 17:38:23 -06:00
Michael Kirk 7a3de0bebd Merge branch 'mkirk/fix-sync-processing' into release/2.32.0 2018-11-24 17:37:51 -06:00
Michael Kirk 4a70f8dc0f only process attachments if they exist 2018-11-24 17:35:15 -06:00
Michael Kirk 18766280f6 fix crash when non-registered user upgrades 2018-11-23 11:38:51 -06:00
Michael Kirk a5dec2321e "Bump build to 2.32.0.14." 2018-11-21 22:32:02 -06:00
Michael Kirk c29224e4ea sync translations 2018-11-21 22:31:48 -06:00
Michael Kirk 68a7a6da03 Merge branch 'mkirk/fix-tap-crash-on-iOS10' into release/2.32.0 2018-11-21 22:27:14 -06:00
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 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
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 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 20be554a74 Update Cocoapods. 2018-11-15 12:44:10 -05:00
Matthew Chen 391f901d11 Merge branch 'charlesmchen/fixSAE' into release/2.32.0 2018-11-15 12:42:59 -05:00
Matthew Chen 08a135a3f4 Respond to CR. 2018-11-15 12:42:48 -05:00
Matthew Chen 81f234f6a0 Fix breakage in share extension. 2018-11-15 12:42:48 -05:00
Michael Kirk 0efb960323 "Bump build to 2.32.0.9." 2018-11-15 10:54:18 -06:00
Michael Kirk 12b916ad36 Merge tag '2.31.0.37' into release/2.32.0 2018-11-15 10:35:03 -06:00
Michael Kirk a27b04613d CR: simplify scroll check 2018-11-15 10:29:49 -06:00
Michael Kirk a60dc2bfe7 Merge branch 'mkirk/pager-rail-style' into release/2.32.0 2018-11-15 10:24:21 -06:00
Michael Kirk ff63c31dae CR: rename colors 2018-11-15 10:23:53 -06:00
Michael Kirk 47a7114317 Gallery pager style changes 2018-11-15 10:16:51 -06:00
Michael Kirk c5bcba45be Merge branch 'mkirk/fix-all-media-view' into release/2.32.0 2018-11-15 10:16:30 -06:00
Michael Kirk f6e9fce0d3 fix All Media button from conversation settings 2018-11-15 10:16:22 -06:00
Matthew Chen 5c02f8d34c "Bump build to 2.31.0.37." 2018-11-14 23:29:56 -05:00
Matthew Chen b38a1030d5 Merge branch 'charlesmchen/socketCleanup' into release/2.31.0 2018-11-14 23:28:33 -05:00