Commit graph

7922 commits

Author SHA1 Message Date
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
Matthew Chen f1b1307542 Merge branch 'charlesmchen/readMessageStatusIcon' 2018-07-10 13:57:23 -04:00
Matthew Chen 575d0be6a6 Apply 'read' message status icon. 2018-07-10 13:57:01 -04:00
Michael Kirk bfebd1202c Merge branch 'mkirk/date-breaks' 2018-07-10 11:46:23 -06:00
Michael Kirk c8b4e879e7 CR: remove unused font 2018-07-10 11:39:56 -06:00
Michael Kirk c81799169e CR: intercell spacing dicated by ConversationViewItem 2018-07-10 11:39:56 -06:00
Michael Kirk 3e1c1ab6ca capitalize date breaks
// FREEBIE
2018-07-10 11:39:56 -06:00
Michael Kirk 77e9533dc1 remove hairline
// FREEBIE
2018-07-10 11:39:56 -06:00
Michael Kirk f22cb48f85 date break font/color to spec
// FREEBIE
2018-07-10 11:39:56 -06:00
Michael Kirk 56e5abb2c3 Format date breaks to spec
// FREEBIE
2018-07-10 11:39:56 -06:00
Michael Kirk 0b2facd369 Only include date in date header (no time)
// FREEBIE
2018-07-10 11:39:56 -06:00
Michael Kirk 68ffd81390 Only show breaks between new days
// FREEBIE
2018-07-10 11:38:41 -06:00
Michael Kirk 66521d94c3 Merge branch 'mkirk/white-status-for-calls' 2018-07-10 11:36:57 -06:00
Michael Kirk 28abf426f1 White status bar for call screen
Transition to VC controlled status bar style.
2018-07-10 11:36:40 -06:00
Michael Kirk bd9c93edba Merge branch 'mkirk/tweak-selected-color' 2018-07-10 11:33:43 -06:00
Michael Kirk 998c2f392c CR: inline per code review 2018-07-10 11:33:24 -06:00
Michael Kirk 834021fe39 tweak selected color for homeview cells 2018-07-10 11:28:00 -06:00
Michael Kirk 8238406261 Merge branch 'mkirk/fix-text-color-for-outgoing-failed' 2018-07-10 10:10:18 -06:00
Michael Kirk 10ac7be03a prefer localizedUppercaseString for user facing text
// FREEBIE
2018-07-10 10:09:31 -06:00
Michael Kirk d5e15b2a0d FAILED label capitalized to spec 2018-07-10 10:07:36 -06:00
Michael Kirk 76745bee5b failed background color to spec 2018-07-10 10:07:36 -06:00
Michael Kirk b0978abd01 use points not pixels when determining how short a device is 2018-07-10 09:45:27 -06:00
Matthew Chen 14741c1dca Merge branch 'charlesmchen/attachmentUpload2' 2018-07-10 10:00:28 -04:00
Matthew Chen a9c7e77b84 Respond to CR. 2018-07-10 09:58:45 -04:00
Matthew Chen c70d33b9e4 Tweak attachment upload view. 2018-07-10 09:30:23 -04:00
Matthew Chen 2f12cd9974 Merge branch 'charlesmchen/tweakHomeView2' 2018-07-10 09:28:56 -04:00
Matthew Chen 0a35cbab13 Respond to CR. 2018-07-10 09:28:48 -04:00
Matthew Chen d0618e3738 Apply 'failed' message status icon in home view. 2018-07-10 09:28:48 -04:00