Commit graph

10511 commits

Author SHA1 Message Date
Michael Kirk f1e508cb60 Recover status bar style when canceling PhotoPicker 2019-01-22 09:13:22 -07:00
Michael Kirk df4e5eb73e Merge branch 'mkirk/max-attachment-toast' into release/2.34.0 2019-01-22 09:12:51 -07:00
Michael Kirk 169581f12f show toast when selecting too many items 2019-01-22 09:12:43 -07:00
Michael Kirk f5be0d545a Merge branch 'mkirk/fix-offset' into release/2.34.0 2019-01-22 09:07:24 -07:00
Michael Kirk 870a7f292b Fix scroll offset for non-iPhoneX devices 2019-01-22 09:07:21 -07:00
Matthew Chen 710b80e566 Merge branch 'charlesmchen/noteToSelfFeatureFlag' into release/2.34.0 2019-01-22 10:48:01 -05:00
Matthew Chen 7878c0fac8 Add feature flag for 'note to self'. 2019-01-18 17:22:12 -05:00
Matthew Chen 7f1c6a84c9 "Bump build to 2.34.0.25." 2019-01-18 17:00:17 -05:00
Matthew Chen 3d39286913 Update l10n strings. 2019-01-18 16:59:22 -05:00
Matthew Chen cf2371222d Merge branch 'mkirk/fix-must-reselect' into release/2.34.0 2019-01-18 16:55:17 -05:00
Michael Kirk 066b400590 Honor selection with "Add More" 2019-01-18 10:34:11 -07:00
Matthew Chen bd5148d27f "Bump build to 2.34.0.24." 2019-01-17 14:47:34 -05:00
Matthew Chen 99478047c5 Merge branch 'mkirk/fix-missing-retry' into release/2.34.0 2019-01-17 14:47:02 -05:00
Matthew Chen 343c7d8ece Remove timer queue. 2019-01-17 14:45:43 -05:00
Michael Kirk 323249baa0 NSRunLoop methods should only be accessed on it's corresponding thread. 2019-01-17 14:43:18 -05:00
Michael Kirk 64cdaae02e schedule retry timer on main run loop 2019-01-17 14:43:18 -05:00
Matthew Chen a479e41628 Merge branch 'charlesmchen/sortIdMigrationRobustness' into release/2.34.0 2019-01-17 14:42:39 -05:00
Matthew Chen debf2e7a95 Fix 'mutation during enumeration' and 'bad ordering' crashes. 2019-01-17 14:42:24 -05:00
Matthew Chen fc36fe4fcf Merge branch 'charlesmchen/convoLoadMore' into release/2.34.0 2019-01-17 14:36:47 -05:00
Matthew Chen 127ccccb80 Tweak conversation view's "load more" behavior. 2019-01-17 14:36:31 -05:00
Michael Kirk 70f4d69fb7 Merge branch 'mkirk/fix-missing-captionview' into release/2.34.0 2019-01-17 09:54:20 -07:00
Michael Kirk 3c0982e0f9 Fix missing captionView when navigating via RailView 2019-01-17 09:54:10 -07:00
Matthew Chen c5d568de58 "Bump build to 2.34.0.23." 2019-01-16 16:52:50 -05:00
Matthew Chen b23a8b75d3 Merge branch 'charlesmchen/landscapeOrientationFeatureFlag' into release/2.34.0 2019-01-16 16:52:37 -05:00
Matthew Chen be714399c7 Add feature flag for landscape orientation. 2019-01-16 16:49:25 -05:00
Matthew Chen eab3599ce9 Add feature flag for landscape orientation. 2019-01-16 16:42:11 -05:00
Matthew Chen cef28eb103 "Bump build to 2.34.0.22." 2019-01-16 15:25:32 -05:00
Matthew Chen acab31bb68 Merge branch 'charlesmchen/syncDeviceOrientation' into release/2.34.0 2019-01-16 15:25:13 -05:00
Matthew Chen 9d020e490c Respond to CR. 2019-01-16 15:24:19 -05:00
Matthew Chen 48fda586c3 Sync device orientation when conversation view and home view appear. 2019-01-16 12:21:43 -05:00
Matthew Chen a5d9a40c8c Merge branch 'charlesmchen/shareExtensionNavbar' into release/2.34.0 2019-01-16 12:20:02 -05:00
Matthew Chen 635a644e2f Fix safe area insets in SAE. 2019-01-16 10:04:33 -05:00
Matthew Chen 50f9a089bf Fix navbar layout in share extension. 2019-01-16 09:55:23 -05:00
Matthew Chen 4f0c26d5c7 Merge branch 'charlesmchen/unlinkDeviceName' into release/2.34.0 2019-01-16 09:02:57 -05:00
Matthew Chen db30ffb75c Decrypt device name in unlink confirmation alert. 2019-01-15 16:47:57 -05:00
Matthew Chen 83309616be "Bump build to 2.34.0.21." 2019-01-15 16:42:41 -05:00
Matthew Chen a372e00ab3 Merge branch 'charlesmchen/tapAlbumWithFailedImage2' into release/2.34.0 2019-01-15 16:40:18 -05:00
Matthew Chen e91195385b Respond to CR. 2019-01-15 16:39:01 -05:00
Matthew Chen 04a300784f Respond to CR. 2019-01-15 16:34:46 -05:00
Matthew Chen 42762ad907 Allow taps in albums with failed images. 2019-01-15 16:34:46 -05:00
Matthew Chen b6e28adfe3 Merge branch 'charlesmchen/inputToolbarMarginsVsRotation3' into release/2.34.0 2019-01-15 16:34:09 -05:00
Matthew Chen b8e2cb6267 Respond to CR. 2019-01-15 16:33:54 -05:00
Matthew Chen 18c890bb95 Fix input toolbar margins issue. 2019-01-15 16:30:32 -05:00
Michael Kirk 8d87449986 Merge branch 'mkirk/eagerly-load-rail' into release/2.34.0 2019-01-15 10:27:47 -07:00
Michael Kirk 7fddb35715 eagerly load entire album to populate rail 2019-01-15 10:27:29 -07:00
Michael Kirk 101d17cfeb Merge branch 'mkirk/video-select' into release/2.34.0 2019-01-14 14:25:52 -07:00
Michael Kirk a497e44cef Fix iCloud download 2019-01-14 12:19:59 -07:00
Michael Kirk 59e037986a Show error when image request fails 2019-01-14 12:15:13 -07:00
Michael Kirk 623c2574d0 Merge branch 'mkirk/dont-select-unless-batch' 2019-01-14 10:29:28 -07:00
Michael Kirk 5fdb88ddf4 Don't add to selection unless in batch select mode
Fixes:

- choose attachment > media library
- tap image A
- tap back
- tap select
- select images B, C
- tap Done
- see image A, B, and C in the rail, but should just see image B and C
2019-01-14 10:28:45 -07:00