Commit Graph

22799 Commits

Author SHA1 Message Date
Matthew Chen
4d3707a16e Apply "disappearing messages disabled" icon. 2018-07-12 15:37:08 -04:00
Matthew Chen
92515bdd1d Merge branch 'charlesmchen/moreTweaks' 2018-07-12 15:36:45 -04:00
Matthew Chen
8287076499 More design tweaks. 2018-07-12 15:36:22 -04:00
Matthew Chen
220dfef1ab Merge branch 'charlesmchen/dedupeForwardClasses' 2018-07-12 15:35:49 -04:00
Matthew Chen
49b0ea993d Dedupe forward class declarations. 2018-07-12 15:35:42 -04:00
Matthew Chen
5a91391aee Fix release breakage. 2018-07-12 10:45:14 -04:00
Matthew Chen
343faed8b7 Merge branch 'charlesmchen/tweakAppearance' 2018-07-12 09:29:53 -04:00
Matthew Chen
83545e72a1 Tweak appearance. 2018-07-12 09:29:46 -04:00
Matthew Chen
0c420ed28a Tweak appearance. 2018-07-12 09:29:46 -04:00
Matthew Chen
750b935122 Tweak appearance. 2018-07-12 09:29:46 -04:00
Michael Kirk
19173a20b9 "Bump build to 2.28.0.6." 2018-07-11 17:35:58 -06:00
Michael Kirk
cba041db18 sync translations
// FREEBIE
2018-07-11 17:35:42 -06:00
Michael Kirk
68ad2dde54 Merge branch 'charlesmchen/reworkUnreadIndicator2' 2018-07-11 17:23:11 -06:00
Matthew Chen
a505c2a89e Tweak unread indicator + date. 2018-07-11 17:19:55 -04:00
Matthew Chen
04da18c7fd Merge branch 'charlesmchen/reworkUnreadIndicator' 2018-07-11 17:14:27 -04:00
Matthew Chen
376e2cc1db Respond to CR. 2018-07-11 16:54:44 -04:00
Matthew Chen
35f058c46a Rework unread indicators. 2018-07-11 16:43:39 -04:00
Matthew Chen
ecafe546b6 Rework unread indicators. 2018-07-11 16:43:39 -04:00
Matthew Chen
8d72bb032e Rework unread indicators. 2018-07-11 16:43:39 -04:00
Matthew Chen
1ce147e945 Merge branch 'charlesmchen/tweakDisappearingMessagesIndicator' 2018-07-11 15:43:48 -04:00
Matthew Chen
e48a1e0816 Respond to CR. 2018-07-11 15:43:27 -04:00
Matthew Chen
6711ed1cf3 Respond to CR. 2018-07-11 15:38:49 -04:00
Matthew Chen
f426af8167 Respond to CR. 2018-07-11 15:38:49 -04:00
Matthew Chen
6d45d533ef Respond to CR. 2018-07-11 15:38:49 -04:00
Matthew Chen
e01579ed44 Tweak disappearing messages indicator. 2018-07-11 15:38:49 -04:00
Matthew Chen
0038c9b3b3 Tweak disappearing messages indicator. 2018-07-11 15:38:49 -04:00
Matthew Chen
d42ff03ecd Tweak disappearing messages indicator. 2018-07-11 15:38:49 -04:00
Matthew Chen
ec7365971e Update cocoapods. 2018-07-11 15:38:37 -04:00
Matthew Chen
bbe2760481 Merge branch 'charlesmchen/tweakSystemMessages2' 2018-07-11 15:35:53 -04:00
Matthew Chen
dbb0a494f9 Tweak system messages. 2018-07-11 15:34:16 -04:00
Matthew Chen
d278017df1 Tweak system messages. 2018-07-11 15:34:16 -04:00
Matthew Chen
158aa3abc4 Tweak system messages; incomplete vs. missed calls. 2018-07-11 15:34:16 -04:00
Matthew Chen
8b3bdb88f3 Revert "Merge branch 'charlesmchen/tweakCalls'"
This reverts commit 3e0233ea60, reversing
changes made to 74ce3012cf.
2018-07-11 15:34:16 -04:00
Matthew Chen
b2fe4b910d Merge branch 'charlesmchen/disappearingMessagesIcon' 2018-07-11 15:33:32 -04:00
Matthew Chen
9494023107 Update disappearing messages icon. 2018-07-11 14:40:59 -04:00
Michael Kirk
5caa289bc3 "Bump build to 2.28.0.5." 2018-07-10 17:06:39 -06:00
Michael Kirk
df568753c9 sync translations 2018-07-10 17:06:31 -06:00
Michael Kirk
4a4eb9b833 Merge branch 'charlesmchen/tweakPhoneNumberProfileNames' 2018-07-10 16:49:43 -06:00
Matthew Chen
fdc4fafe7a Tweak phone number & profile names. 2018-07-10 16:49:40 -06:00
Michael Kirk
c4d52505b7 Merge branch 'mkirk/sync-colors' 2018-07-10 13:25:53 -06:00
Michael Kirk
f0175c0b6f feature gate color syncing
// FREEBIE
2018-07-10 13:25:38 -06:00
Michael Kirk
a66c88e3cf Fix getter for contact threads, remove sneaky read transaction for DM config. 2018-07-10 13:25:38 -06:00
Michael Kirk
92705490a0 No write transaction needed for syncing colors
// FREEBIE
2018-07-10 13:25:38 -06:00
Michael Kirk
66e726a1f1 DRY per CR 2018-07-10 13:25:38 -06:00
Michael Kirk
3530bf4fe0 sync configuration off main thread 2018-07-10 13:25:38 -06:00
Michael Kirk
8a43435dfc avoid deadlock 2018-07-10 13:25:38 -06:00
Michael Kirk
61cb19ef6b trigger sync when colors updates 2018-07-10 13:25:38 -06:00
Michael Kirk
d53f583e45 sync colors with group 2018-07-10 13:25:38 -06:00
Michael Kirk
4d3d5d98e1 Sync colors with contacts 2018-07-10 13:25:38 -06:00
Michael Kirk
553a94286f update protobufs to sync group color 2018-07-10 13:25:38 -06:00