Commit Graph

18089 Commits

Author SHA1 Message Date
Matthew Chen
b18ea23bf2 Respond to CR. 2020-06-23 10:17:15 -03:00
Matthew Chen
6acdeacdb9 Tweak conversation view configuration. 2020-06-23 10:16:38 -03:00
Matthew Chen
2e27e34f79 Avoid double-measurement in conversation cell configuration. 2020-06-23 10:16:38 -03:00
Matthew Chen
23efff90df Merge branch 'charlesmchen/stickerPerf' 2020-06-23 10:07:29 -03:00
Matthew Chen
059909bd1b Address sticker perf hotspots. 2020-06-23 10:07:18 -03:00
Matthew Chen
308872d66c Merge branch 'charlesmchen/fixTests' 2020-06-23 10:04:57 -03:00
Matthew Chen
154805cf68 Fix broken tests. 2020-06-23 10:04:39 -03:00
Matthew Chen
6ca433bec9 Merge branch 'charlesmchen/refineContactSyncs' 2020-06-22 10:53:53 -03:00
Matthew Chen
71e9c89faa Rework contact syncs. 2020-06-22 10:53:31 -03:00
Nora Trapp
de35f1fbc9 Fix an additional merge issue 2020-06-19 12:04:51 -07:00
Nora Trapp
91310073d1 Fix a typo 2020-06-19 12:02:51 -07:00
Nora Trapp
84d9df427b Merge branch 'nt/badge-count' 2020-06-19 12:01:33 -07:00
Nora Trapp
b6d99789bf Include marked unread threads in badge count 2020-06-19 12:01:20 -07:00
Nora Trapp
7f32c24617 Omit muted threads from badge count 2020-06-19 11:59:11 -07:00
Matthew Chen
0530fb9a49 Merge branch 'charlesmchen/threadVsOverwritingUpdates' 2020-06-19 15:56:13 -03:00
Matthew Chen
f6c7b67ea9 Eradicate usage of anyOverwritingUpdateWithTransaction: in TSThread. 2020-06-19 15:55:43 -03:00
Nora Trapp
bbce83bb28 Merge branch 'nt/consolidate-scroll-to-logic' 2020-06-19 11:54:42 -07:00
Nora Trapp
086a65ff7c Consolidate conversation scrolling logic 2020-06-19 11:54:31 -07:00
Matthew Chen
edb1a37345 "Bump build to 3.12.0.2." (Internal) 2020-06-19 11:34:13 -03:00
Matthew Chen
3d65281a0b Merge branch 'charlesmchen/memberBarOrdering' 2020-06-19 02:19:20 -03:00
Matthew Chen
7d12df6273 Order 'new member bar' by order added. 2020-06-19 02:19:02 -03:00
Matthew Chen
9af0e0aa32 Merge remote-tracking branch 'private/release/3.11.0' 2020-06-19 02:18:20 -03:00
Matthew Chen
da20eb8568 "Bump build to 3.11.0.24." 2020-06-19 02:04:01 -03:00
Nora Trapp
a716d6b053 Feature flags for beta 2020-06-19 02:03:58 -03:00
Matthew Chen
1a416c770d "Bump build to 3.11.0.23." 2020-06-19 02:03:38 -03:00
Nora Trapp
eefee44a33 Feature flags for production. 2020-06-19 02:03:27 -03:00
Matthew Chen
b31dec3dd6 Merge branch 'charlesmchen/sessionCreationRaces_' into release/3.11.0 2020-06-19 02:02:48 -03:00
Matthew Chen
d92693ff37 Fix races in message sender's session creation logic. 2020-06-19 01:52:48 -03:00
Nora Trapp
253610f3dc Fix codegen conflict 2020-06-18 16:48:17 -07:00
Nora Trapp
485b86d958 Merge branch 'nt/preserve-scroll' 2020-06-18 16:25:24 -07:00
Nora Trapp
8b7772c7b8 Fall forward if there are no messages to fall back to when preserving scroll position 2020-06-18 16:25:04 -07:00
Nora Trapp
6105795cb3 PR Feedback 2020-06-18 16:25:04 -07:00
Nora Trapp
d0534ea642 Preserve conversation scroll position 2020-06-18 16:25:04 -07:00
Nora Trapp
cecc57b82b Merge branch 'release/3.11.0' 2020-06-18 10:27:24 -07:00
Nora Trapp
191527f01f "Bump build to 3.11.0.22." 2020-06-18 10:25:33 -07:00
Nora Trapp
24b61102e2 Feature flags for beta 2020-06-18 10:25:27 -07:00
Nora Trapp
043eb1e0c8 "Bump build to 3.11.0.21." 2020-06-18 10:25:14 -07:00
Nora Trapp
21d51b12e4 Feature flags for production. 2020-06-18 10:24:50 -07:00
Nora Trapp
5567776207 Sync translations 2020-06-18 10:24:28 -07:00
Nora Trapp
60c65ea4e1 Use sent time on unread indicator cell 2020-06-18 10:21:52 -07:00
Matthew Chen
9e1704388d Disable model cache stats logging. 2020-06-18 14:17:23 -03:00
Matthew Chen
5b52b24486 Fix production build break. 2020-06-18 13:06:01 -03:00
Matthew Chen
2a9b470648 "Bump build to 3.12.0.1." (Internal) 2020-06-18 12:52:10 -03:00
Matthew Chen
0d2855041b Merge branch 'charlesmchen/cacheThreadsInteractionsAndAttachments' 2020-06-18 12:51:20 -03:00
Matthew Chen
52f3b66b63 Update Cocoapods. 2020-06-18 12:50:46 -03:00
Matthew Chen
9bc526b6bb Respond to CR. 2020-06-18 12:49:35 -03:00
Matthew Chen
2a72d563ae Respond to CR. 2020-06-18 12:22:14 -03:00
Matthew Chen
a4ae58c0f6 Respond to CR. 2020-06-18 12:09:42 -03:00
Matthew Chen
47d4c6013b Clean up ahead of PR. 2020-06-18 12:05:07 -03:00
Matthew Chen
d4740c9584 Cache threads, interactions, attachments. Improve model cache. 2020-06-18 12:05:07 -03:00