Commit graph

4227 commits

Author SHA1 Message Date
Michael Kirk
80ae952716 Merge branch 'mkirk/fix-assert' 2017-09-28 13:12:13 -04:00
Michael Kirk
e77a7e09bb Fix assert for empty thread
// FREEBIE
2017-09-28 13:06:29 -04:00
Matthew Chen
5faeed4d59 Fix breakage.
// FREEBIE
2017-09-28 10:26:10 -04:00
Matthew Chen
f0021bb351 Merge branch 'charlesmchen/readReceiptsCopy' 2017-09-28 10:11:12 -04:00
Matthew Chen
3566ed8ded Update read receipts setting copy.
// FREEBIE
2017-09-28 10:11:03 -04:00
Matthew Chen
147f99f1ba Merge branch 'charlesmchen/reworkMessageMetadataView' 2017-09-28 10:10:08 -04:00
Matthew Chen
2dce0e9b1b Respond to CR.
// FREEBIE
2017-09-28 10:09:54 -04:00
Matthew Chen
26c8c4e1fa Rework message metadata view.
// FREEBIE
2017-09-28 10:06:50 -04:00
Matthew Chen
de29b5a6ee Rework message metadata view.
// FREEBIE
2017-09-28 10:06:50 -04:00
Matthew Chen
29c4059049 Rework message metadata view.
// FREEBIE
2017-09-28 10:06:50 -04:00
Michael Kirk
ca76af1feb Merge branch 'mkirk/remove-already-registered-button' 2017-09-28 09:47:53 -04:00
Michael Kirk
655598d0a3 remove existing account button
// FREEBIE
2017-09-28 09:47:44 -04:00
Matthew Chen
cdd17c7699 Merge branch 'charlesmchen/outgoingMessagesFromLinkedDevices' 2017-09-28 09:18:59 -04:00
Matthew Chen
1df1144e43 Respond to CR.
// FREEBIE
2017-09-28 09:18:38 -04:00
Matthew Chen
33376f66d2 Simplify processing of messages from linked devices.
// FREEBIE
2017-09-27 20:41:12 -04:00
Matthew Chen
1a3b3b2c06 Merge branch 'charlesmchen/contactCellsInMessageMetadata' 2017-09-27 20:26:08 -04:00
Matthew Chen
a231834a73 Use contact cells in message metadata view.
// FREEBIE
2017-09-27 20:25:02 -04:00
Matthew Chen
0b60b521c6 Merge branch 'charlesmchen/tweakReadReceiptsSetting' 2017-09-27 20:23:48 -04:00
Matthew Chen
d6e8849248 Rework "send read receipts" setting.
// FREEBIE
2017-09-27 20:23:41 -04:00
Matthew Chen
6aec891771 Merge branch 'charlesmchen/silentMessages' 2017-09-27 20:20:15 -04:00
Matthew Chen
9b5affb390 Send silent messages where appropriate.
// FREEBIE
2017-09-27 17:13:29 -04:00
Matthew Chen
cc2d08d036 Merge branch 'charlesmchen/messageDetailViewChanges_' 2017-09-27 16:52:46 -04:00
Matthew Chen
d28a014e2d Respond to CR.
// FREEBIE
2017-09-27 16:52:31 -04:00
Matthew Chen
cf4aeac0ec Modify message metadata view to observe DB changes.
// FREEBIE
2017-09-27 16:50:24 -04:00
Matthew Chen
745e9978d2 Merge branch 'charlesmchen/messageDates' 2017-09-27 16:39:11 -04:00
Matthew Chen
b3ab6d0602 Respond to CR.
// FREEBIE
2017-09-27 16:38:48 -04:00
Matthew Chen
3a39a1ba51 Format message statuses with date if possible.
// FREEBIE
2017-09-27 16:38:48 -04:00
Matthew Chen
d557817bb4 Format message statuses with date if possible.
// FREEBIE
2017-09-27 16:38:48 -04:00
Michael Kirk
0b535ae811 sync translations
// FREEBIE
2017-09-27 14:45:51 -04:00
Michael Kirk
3485ff8d2d bump version
// FREEBIE
2017-09-27 14:39:43 -04:00
Matthew Chen
8088318db8 Merge branch 'charlesmchen/migrateDecryptJobs' 2017-09-27 14:22:08 -04:00
Matthew Chen
834ad3f8e1 Respond to CR.
// FREEBIE
2017-09-27 14:22:01 -04:00
Matthew Chen
01bda556c8 Fix class rename.
// FREEBIE
2017-09-27 14:22:01 -04:00
Matthew Chen
6b8c9b6bcf Iterate the names of the incoming message queue extensions.
// FREEBIE
2017-09-27 14:22:01 -04:00
Matthew Chen
eec0efa3c8 Fix class rename.
// FREEBIE
2017-09-27 14:22:01 -04:00
Matthew Chen
eec2e5c76f Merge branch 'charlesmchen/deliveryReceipts' 2017-09-27 14:19:39 -04:00
Matthew Chen
a4d285f50d Respond to CR.
// FREEBIE
2017-09-27 14:19:26 -04:00
Matthew Chen
aa7329013d Handle new-style delivery receipts.
// FREEBIE
2017-09-27 14:09:47 -04:00
Matthew Chen
25c40ea3cf Handle new-style delivery receipts.
// FREEBIE
2017-09-27 14:09:47 -04:00
Matthew Chen
60738b450f Merge branch 'charlesmchen/refactorLinkedDeviceReadReceipts' 2017-09-27 14:05:28 -04:00
Matthew Chen
ee13084d5c Respond to CR.
// FREEBIE
2017-09-27 14:05:21 -04:00
Matthew Chen
ffe44e68be Refactor linked device read receipts.
// FREEBIE
2017-09-27 13:17:43 -04:00
Matthew Chen
289291e03d Merge branch 'charlesmchen/profileDeadlock_' 2017-09-27 13:00:40 -04:00
Matthew Chen
16d4256e99 Address deadlocks in profile manager.
// FREEBIE
2017-09-27 13:00:01 -04:00
Matthew Chen
1fe905f0f9 Merge branch 'charlesmchen/npeCanPerformAction' 2017-09-27 12:57:15 -04:00
Matthew Chen
af7fd60d76 Fix NPE in conversation view.
// FREEBIE
2017-09-27 11:31:48 -04:00
Michael Kirk
e617ae910d Merge branch 'mkirk/no-sync-profile' 2017-09-26 10:46:04 -04:00
Michael Kirk
4777335ffa Don't attempt to sync profile until registered.
Otherwise there's an unnecessary initial (innocuous) failed HTTP attempt
on first launch for unregistered users.

// FREEBIE
2017-09-26 10:45:45 -04:00
Matthew Chen
c38fd51fbc Merge branch 'charlesmchen/profileDeadlock2' 2017-09-26 09:46:58 -04:00
Matthew Chen
9dcc7e1ea0 Respond to CR.
// FREEBIE
2017-09-26 09:46:47 -04:00