Commit Graph

12578 Commits

Author SHA1 Message Date
Matthew Chen
b9428471cf Merge branch 'charlesmchen/perMessageTimerTombstone' 2019-06-13 17:50:39 -04:00
Matthew Chen
77841451b8 Respond to CR. 2019-06-13 17:50:25 -04:00
Matthew Chen
4ac51e95c2 Sketch out the "tombstone" state of messages with per-message expiration. 2019-06-13 17:26:29 -04:00
Matthew Chen
9553206d6d Merge branch 'charlesmchen/perMessageTimerSync' 2019-06-13 17:22:46 -04:00
Matthew Chen
f535549422 Respond to CR. 2019-06-13 17:22:26 -04:00
Matthew Chen
b01f6f681e Respond to CR. 2019-06-13 17:17:35 -04:00
Matthew Chen
f85dba0f7e Update Cocoapods. 2019-06-13 17:17:35 -04:00
Matthew Chen
21a0618125 Receive per-message expiration sync messages. 2019-06-13 17:17:35 -04:00
Matthew Chen
43eb138827 Receive per-message expiration sync messages. 2019-06-13 17:17:35 -04:00
Matthew Chen
2431ac68c6 Update proto schema for per-message expiration sync messages. 2019-06-13 17:17:35 -04:00
Matthew Chen
97e5a8eb75 Send per-message expiration sync messages. 2019-06-13 17:17:35 -04:00
Matthew Chen
1cd9b4431a Update proto schema for per-message expiration sync messages. 2019-06-13 17:17:35 -04:00
Matthew Chen
8056108a38 Fix merge breakage. 2019-06-13 17:05:58 -04:00
Matthew Chen
e27eada1aa Merge tag '2.40.0.23' 2019-06-13 17:02:40 -04:00
Matthew Chen
c83c6402ed "Bump build to 2.40.0.23." 2019-06-13 16:32:52 -04:00
Matthew Chen
c9e0099846 Merge branch 'charlesmchen/unknownProtocolVersionVsSyncTranscripts' into release/2.40.0 2019-06-13 16:32:25 -04:00
Matthew Chen
c684e7fde4 "Bump build to 2.41.0.0." 2019-06-13 16:30:10 -04:00
Matthew Chen
415e7711c4 Respond to CR. 2019-06-13 16:24:53 -04:00
Michael Kirk
1742f907cb Merge branch 'mkirk/fixup-tests-8' 2019-06-13 14:37:45 -05:00
Michael Kirk
f82359b41d test v. optional proto enums 2019-06-13 14:37:45 -05:00
Michael Kirk
3de5ac7faf Merge branch 'mkirk/silent-notification' 2019-06-13 14:25:37 -05:00
Michael Kirk
2749765e4c new user notifications are inaudible 2019-06-13 14:02:45 -05:00
Nora Trapp
66e8d5b444 Merge branch 'nt/autocorrect-all-the-things' 2019-06-13 09:41:10 -07:00
Nora Trapp
ac2abaf705 PR Feedback 2019-06-13 09:40:35 -07:00
Nora Trapp
13a80ef8aa Accept autocorrect suggestions in all the textViews that can be dismissed without the keyboard 2019-06-13 09:24:03 -07:00
Nora Trapp
68e69f0bc4 Merge branch 'nt/swipe-to-reply' 2019-06-13 09:21:35 -07:00
Nora Trapp
cd281f22b2 Bounce a little 2019-06-13 09:21:15 -07:00
Nora Trapp
e103d1d493 PR Feedback 2019-06-13 09:21:15 -07:00
Nora Trapp
0757981008 Reduce touch region for audio scrubbing 2019-06-13 09:21:15 -07:00
Nora Trapp
70de083495 Updated swipe-to-reply animation 2019-06-13 09:21:15 -07:00
Matthew Chen
a8024225a7 Merge branch 'charlesmchen/perMessageTimerSenders' 2019-06-13 11:19:49 -04:00
Matthew Chen
f7a82cbb38 Include sender state for per-message expiration messages in group threads. 2019-06-13 11:19:09 -04:00
Matthew Chen
3e58ef04e3 Merge branch 'charlesmchen/perMessageTimerViews2' 2019-06-13 11:17:58 -04:00
Matthew Chen
6247b79a36 Respond to CR. 2019-06-13 11:17:39 -04:00
Matthew Chen
eac4af0a4c Add full-screen view to render messages with per-message expiration in conversation view. 2019-06-13 11:17:39 -04:00
Matthew Chen
af20fe7989 Add full-screen view to render messages with per-message expiration in conversation view. 2019-06-13 11:17:39 -04:00
Matthew Chen
69ada9acd8 Add full-screen view to render messages with per-message expiration in conversation view. 2019-06-13 11:17:39 -04:00
Matthew Chen
195f1ebec8 Don't allow "reply" messages with per-message expiration. 2019-06-13 11:17:39 -04:00
Nora Trapp
d6c94d8d96 Merge branch 'nt/sticker-rotation' 2019-06-13 08:02:20 -07:00
Nora Trapp
2165ae1051 Don't change sticker packs when orientation is changing. 2019-06-13 08:02:05 -07:00
Matthew Chen
ea1306bad2 Merge branch 'charlesmchen/perMessageTimerViews_' 2019-06-13 10:55:26 -04:00
Matthew Chen
a1184dd581 Respond to CR. 2019-06-13 10:55:10 -04:00
Matthew Chen
7c5b023078 Add views to render messages with per-message expiration in conversation view. 2019-06-13 10:55:10 -04:00
Matthew Chen
f24f79773b Add views to render messages with per-message expiration in conversation view. 2019-06-13 10:52:50 -04:00
Matthew Chen
08d1592cb1 Add views to render messages with per-message expiration in conversation view. 2019-06-13 10:52:50 -04:00
Matthew Chen
a6280e61c5 Add views to render messages with per-message expiration in conversation view. 2019-06-13 10:51:17 -04:00
Matthew Chen
21735a7666 Handle unknown protocol version in sync transcripts. 2019-06-13 10:48:29 -04:00
Michael Kirk
8d775f497b Merge branch 'mkirk/move-scripts' 2019-06-13 09:28:14 -05:00
Michael Kirk
1b9a8274f6 move localization scripts to Scripts 2019-06-13 09:28:14 -05:00
Michael Kirk
9b1aa6dfec Merge branch 'mkirk/new-user-notification' 2019-06-13 09:20:58 -05:00