Commit graph

6769 commits

Author SHA1 Message Date
Matthew Chen
f65757a1ee Merge branch 'charlesmchen/outgoingMessageFixes' 2018-04-30 11:02:51 -04:00
Matthew Chen
bb96454070 More outgoing message fixes. 2018-04-30 11:00:57 -04:00
Matthew Chen
f028627b49 Merge branch 'charlesmchen/systemCellMeasurement' 2018-04-30 10:59:22 -04:00
Matthew Chen
2e06ebfe19 Fix system cell layout. 2018-04-30 10:57:12 -04:00
Matthew Chen
4d100ccb98 Merge remote-tracking branch 'origin/hotfix/2.24.1' 2018-04-30 09:34:09 -04:00
Matthew Chen
7d08bef8a3 "Bump build to 2.25.0.4." 2018-04-27 16:39:34 -04:00
Matthew Chen
479c9f95aa Merge branch 'charlesmchen/outgoingMessageStateFixes' 2018-04-27 16:39:16 -04:00
Matthew Chen
752bca313c Fix glitches in outgoing messages. 2018-04-27 16:37:09 -04:00
Matthew Chen
2ebd2f65d0 Merge branch 'charlesmchen/shareContactProtos' 2018-04-27 12:46:56 -04:00
Matthew Chen
8dbe4387b7 Update protos to reflect 'share contact'. 2018-04-27 12:46:25 -04:00
Matthew Chen
0131b8de2d Update cocoapods. 2018-04-27 12:42:23 -04:00
Matthew Chen
9cdf489ace Merge branch 'charlesmchen/corruptDatabaseViews' 2018-04-26 16:18:55 -04:00
Matthew Chen
c5e7b10bd9 Merge branch 'charlesmchen/dbMigrationsVsStorageReadiness' 2018-04-26 16:18:27 -04:00
Matthew Chen
bec7235d57 "Bump build to 2.24.1.0." 2018-04-26 16:17:12 -04:00
Matthew Chen
81ed1ac799 Merge branch 'charlesmchen/homeViewReference' 2018-04-26 15:32:04 -04:00
Matthew Chen
371718f72e Fix global reference to 'inbox' home view. 2018-04-26 15:31:36 -04:00
Matthew Chen
91f5460a0f "Bump build to 2.25.0.3." 2018-04-26 14:27:13 -04:00
Matthew Chen
8ae956bba8 Update l10n strings. 2018-04-26 14:27:10 -04:00
Matthew Chen
afeddb3b83 Merge branch 'charlesmchen/outgoingMessageStatusFixes' 2018-04-26 14:20:41 -04:00
Matthew Chen
f16e9a2920 Fix issues in outgoing messages status changes. 2018-04-26 14:17:41 -04:00
Matthew Chen
5c6f9ec088 Fix issues in outgoing messages status changes. 2018-04-26 14:12:34 -04:00
Matthew Chen
945ab7e4a2 Merge branch 'mkirk/profile-pic-in-conversation' 2018-04-26 11:51:43 -04:00
Matthew Chen
45be54f7ac Design polish for the "profile pic in conversation view" and "archived conversations in home view." 2018-04-26 11:50:33 -04:00
Michael Kirk
b702695793 cleanup 2018-04-26 11:18:18 -04:00
Michael Kirk
55e19b55b3 Fix layout for iOS9/10
code cleanup

// FREEBIE
2018-04-26 11:18:18 -04:00
Michael Kirk
7a1d24a9ab Avatar updates when contact/profile/group photo changes
// FREEBIE
2018-04-26 11:18:18 -04:00
Michael Kirk
b1bff71145 WIP moving to stackview backed header view in conversation view
- iOS10 with large titles doesn't truncate
2018-04-26 11:18:18 -04:00
Michael Kirk
3d766e4cf8 Replace ConversationHeaderView with stack view in Media Gallery
// FREEBIE
2018-04-26 11:18:18 -04:00
Matthew Chen
37f653a7f9 Merge branch 'charlesmchen/fixCallHangupCrashes' 2018-04-26 11:13:54 -04:00
Matthew Chen
28063574d3 Fix call hangup crashes. 2018-04-26 11:08:21 -04:00
Matthew Chen
802379b4bc "Bump build to 2.25.0.2." 2018-04-25 15:16:17 -04:00
Matthew Chen
9e60a01143 Merge branch 'charlesmchen/dynamicTypeFixes' 2018-04-25 15:12:59 -04:00
Matthew Chen
251ce29a82 Fix dynamic type issues in home view cells. 2018-04-25 15:12:52 -04:00
Matthew Chen
5a42bf0ffb Fix dynamic type issues in home view cells. 2018-04-25 15:12:52 -04:00
Matthew Chen
fb0c47aa12 Fix dynamic type issues. 2018-04-25 15:12:52 -04:00
Matthew Chen
023d40e230 Merge branch 'charlesmchen/nudgeDatabaseUpgradeWarning' 2018-04-25 15:12:14 -04:00
Matthew Chen
3233554683 Show database upgrade warning while launching v2.25 or later. 2018-04-25 15:12:06 -04:00
Matthew Chen
ec180e8b6d Merge branch 'charlesmchen/fixSyncTranscripts' 2018-04-25 15:11:14 -04:00
Matthew Chen
8f19622a89 Fix sync transcripts. 2018-04-25 15:10:03 -04:00
Matthew Chen
cf532b9cba "Bump build to 2.25.0.1." 2018-04-25 11:13:12 -04:00
Matthew Chen
1efbc26e21 Fix build break. 2018-04-25 11:13:08 -04:00
Matthew Chen
789595f6c6 Update l10n strings. 2018-04-25 11:02:14 -04:00
Matthew Chen
79ccc015aa Fix missing l10n strings. 2018-04-25 10:59:41 -04:00
Matthew Chen
015a531ab2 "Bump build to 2.25.0.0." 2018-04-25 10:55:12 -04:00
Matthew Chen
3291ca66c1 Merge branch 'charlesmchen/outgoingMessageState' 2018-04-25 10:49:30 -04:00
Matthew Chen
5773b45345 Respond to CR. 2018-04-25 10:49:19 -04:00
Matthew Chen
c75c3d5f9e Respond to CR. 2018-04-25 10:49:19 -04:00
Matthew Chen
204d379603 Respond to CR. 2018-04-25 10:49:19 -04:00
Matthew Chen
55916e84c2 Respond to CR. 2018-04-25 10:49:19 -04:00
Matthew Chen
4de4a4b229 Respond to CR. 2018-04-25 10:49:19 -04:00