Commit Graph

10589 Commits

Author SHA1 Message Date
Matthew Chen
eb7c6ff441 Respond to CR. 2019-01-23 13:10:25 -05:00
Matthew Chen
9b7ae86a6d Rework layout of conversation input toolbar. 2019-01-23 13:02:52 -05:00
Matthew Chen
6ff6ee2e2e Rework layout of conversation input toolbar. 2019-01-23 13:02:52 -05:00
Michael Kirk
8a8d1f43f4 update pods 2019-01-23 10:28:42 -07:00
Michael Kirk
62023659a1 Revert PromiseKit update for now 2019-01-23 10:27:04 -07:00
Michael Kirk
06f26eca4c Merge branch 'mkirk/update-pods-2' 2019-01-23 09:20:13 -07:00
Michael Kirk
dfc1df8380 update pods 2019-01-23 09:19:20 -07:00
Matthew Chen
88301cbc21 Merge branch 'charlesmchen/linkPreviewsAttachmentCleanup' 2019-01-23 10:02:54 -05:00
Matthew Chen
7e9c3b2dac Clean up all message attachments. 2019-01-23 10:01:16 -05:00
Matthew Chen
1ab5a7ed6b Merge branch 'charlesmchen/linkPreviewsVsIncomingAttachments' 2019-01-23 10:00:40 -05:00
Matthew Chen
7d4e89daac Discard link previews if incoming message has attachments. 2019-01-23 09:59:48 -05:00
Matthew Chen
aa1f90757c Merge branch 'charlesmchen/linkPreviewsOpen' 2019-01-23 09:59:08 -05:00
Matthew Chen
8452f5e74b Open link preview URLs when tapped. 2019-01-23 09:58:37 -05:00
Matthew Chen
00f0d44903 Merge branch 'charlesmchen/linkPreviewsSentView' 2019-01-23 09:57:15 -05:00
Matthew Chen
a51182321c Respond to CR. 2019-01-23 09:56:46 -05:00
Matthew Chen
3d757b492a Add link previews to conversation message bubbles. 2019-01-23 09:32:30 -05:00
Matthew Chen
ca8a4b3751 Make LinkPreviewView reusable. 2019-01-23 09:27:52 -05:00
Matthew Chen
c7053aa36d Add link previews to converastion view items. 2019-01-23 09:26:05 -05:00
Matthew Chen
f62e48f4bb Merge branch 'charlesmchen/linkPreviewsTempFiles' 2019-01-23 09:24:42 -05:00
Matthew Chen
0569ed3f59 Respond to CR. 2019-01-23 09:24:30 -05:00
Matthew Chen
f73f100717 Link preview temp files. 2019-01-23 09:22:16 -05:00
Matthew Chen
186e4e14d2 Merge branch 'charlesmchen/linkPreviewsPreference' 2019-01-23 09:19:40 -05:00
Matthew Chen
feaf5253ac Update Cocoapods. 2019-01-23 09:19:29 -05:00
Matthew Chen
1b87e3165c Add link previews setting. 2019-01-23 09:17:17 -05:00
Matthew Chen
c57b0d98cb Add link previews setting. 2019-01-23 09:17:13 -05:00
Matthew Chen
8c7c9b27a2 Merge tag '2.34.0.26' 2019-01-23 09:14:26 -05:00
Matthew Chen
b5596dcdb6 Merge branch 'charlesmchen/linkPreviews5b' 2019-01-23 09:13:50 -05:00
Matthew Chen
a7144abf93 Respond to CR. 2019-01-23 09:11:13 -05:00
Matthew Chen
416aa2b347 Add rough draft of link preview view to composer. 2019-01-23 09:11:13 -05:00
Matthew Chen
bdd7d53c76 "Bump build to 2.34.0.26." 2019-01-22 17:19:14 -05:00
Matthew Chen
7ed79c2ed5 Update l10n strings. 2019-01-22 17:18:54 -05:00
Matthew Chen
f822ee7375 Merge branch 'charlesmchen/shareAllMediaInAlbum' into release/2.34.0 2019-01-22 17:14:22 -05:00
Matthew Chen
79000d5fbb Save and share all items in album. 2019-01-22 17:14:06 -05:00
Matthew Chen
8dc6ea0c08 Revert "Save and share all items in album"
This reverts commit 58ab3948e969fe09872e51061e2311535d9e0eb4.
2019-01-22 17:14:06 -05:00
Matthew Chen
4fda1be3f5 Save and share all items in album 2019-01-22 17:14:06 -05:00
Michael Kirk
baa42dc910 Merge branch 'mkirk/ios9-10-picker' into release/2.34.0 2019-01-22 15:11:16 -07:00
Michael Kirk
293da74c52 Fix title view for iOS9/10 2019-01-22 15:11:10 -07:00
Michael Kirk
131945a642 Merge branch 'mkirk/body-text-limit' into release/2.34.0 2019-01-22 15:10:49 -07:00
Michael Kirk
896a9f78f7 limit media message body to 2k chars 2019-01-22 13:25:07 -07:00
Michael Kirk
7f47fd2517 allow batch deselection when at attachment limit 2019-01-22 09:44:33 -07:00
Michael Kirk
14436da2e9 Merge branch 'mkirk/pan-select' into release/2.34.0 2019-01-22 09:36:43 -07:00
Michael Kirk
34d11dda49 bulk deselect 2019-01-22 09:36:32 -07:00
Michael Kirk
599a57e3a4 Pan horizontal to bulk select images 2019-01-22 09:19:17 -07:00
Michael Kirk
3ac9732b65 Merge branch 'mkirk/fix-miscolored-status-bar' into release/2.34.0 2019-01-22 09:13:32 -07:00
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
Matthew Chen
977ee9ffe9 Merge remote-tracking branch 'private/release/2.34.0' 2019-01-22 11:10:04 -05: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