Commit Graph

6794 Commits

Author SHA1 Message Date
Michael Kirk
0ab8fc2772 Proper flip asset
// FREEBIE
2018-05-01 18:55:06 -04:00
Michael Kirk
6fcbf05296 Merge branch 'mkirk/remove-assert' 2018-05-01 18:54:29 -04:00
Michael Kirk
d67a3b4167 WORKS GREAT
// FREEBIE
2018-05-01 18:54:14 -04:00
Matthew Chen
fff60e9bdb Merge branch 'charlesmchen/contactNormalizationValidation' 2018-05-01 18:09:01 -04:00
Matthew Chen
d1f6118e6e Rework contact normalization and validation. 2018-05-01 18:08:50 -04:00
Matthew Chen
d7cc7384e9 "Bump build to 2.25.0.5." 2018-05-01 18:01:19 -04:00
Matthew Chen
11591416e6 Merge branch 'charlesmchen/contactShareModel' 2018-05-01 16:10:13 -04:00
Matthew Chen
1520422b29 Respond to CR. 2018-05-01 16:09:53 -04:00
Matthew Chen
0316a98eb8 Undo renaming of contactShare property of TSMessage. 2018-05-01 11:26:01 -04:00
Matthew Chen
147368913c Gather all contact conversion logic in OWSContacts. 2018-05-01 11:03:25 -04:00
Matthew Chen
ee9a13cdf0 Update cocoapods. 2018-05-01 11:03:25 -04:00
Matthew Chen
bd7c8e4a4b Add conversion methods between vcard, system contacts and ows contacts. 2018-05-01 11:03:25 -04:00
Matthew Chen
0d8cfc5403 Rename contact share class to contact. 2018-05-01 11:03:25 -04:00
Matthew Chen
796958d87f Elaborate contact conversion. 2018-05-01 11:03:25 -04:00
Matthew Chen
e22e9a7842 Populate contact share protos. 2018-05-01 11:03:25 -04:00
Matthew Chen
757234d309 Populate contact share protos. 2018-05-01 11:03:25 -04:00
Matthew Chen
2a63423c3d Elaborate fake contact shares. 2018-05-01 11:03:25 -04:00
Matthew Chen
c854cc3de6 Fix fake contact share message creation. 2018-05-01 11:03:25 -04:00
Matthew Chen
521013a674 Fix contact share property synthesis. 2018-05-01 11:03:25 -04:00
Matthew Chen
7490a55f61 Sketch out "contact share" model. 2018-05-01 11:03:25 -04:00
Matthew Chen
4b8a2fa8a3 Sketch out "contact share" model. 2018-05-01 11:03:25 -04:00
Matthew Chen
6005747856 Update protos to reflect 'share contact'. 2018-05-01 11:03:25 -04:00
Matthew Chen
46354cdb11 Merge branch 'charlesmchen/noArchivedThreads' 2018-05-01 10:56:06 -04:00
Matthew Chen
2fe7596e04 Only show archived threads UI if there are archived threads. 2018-05-01 10:55:47 -04:00
Matthew Chen
6ab48cec97 Only show archived threads UI if there are archived threads. 2018-05-01 10:55:47 -04:00
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