Commit Graph

4117 Commits

Author SHA1 Message Date
Matthew Chen
bd360262cb Merge branch 'charlesmchen/readReceiptPreferences' 2017-09-19 17:36:40 -04:00
Matthew Chen
83c21c6159 Add setting for read receipts in app settings.
// FREEBIE
2017-09-19 17:35:42 -04:00
Matthew Chen
65732af3da New users opt-out of read receipts; legacy users opt-in.
// FREEBIE
2017-09-19 17:35:42 -04:00
Matthew Chen
40d728e022 Add read receipts preference.
// FREEBIE
2017-09-19 17:35:42 -04:00
Matthew Chen
80e5f281c6 Rename app preferences class.
// FREEBIE
2017-09-19 17:35:42 -04:00
Matthew Chen
c7fab5b920 Merge branch 'charlesmchen/readReceiptsProtos_' 2017-09-19 17:31:17 -04:00
Matthew Chen
74b2f30523 Revert "Modify read receipt photos to support sending read receipts to both linked devices and senders."
This reverts commit 37e67179c8a8d6ebfdfa124ef0c1229f220ed11d.
2017-09-19 17:30:48 -04:00
Matthew Chen
a7546aee63 Modify read receipt photos to support sending read receipts to both linked devices and senders.
// FREEBIE
2017-09-19 17:30:48 -04:00
Matthew Chen
39a961e376 Rework incoming read receipts handling.
// FREEBIE
2017-09-19 17:30:48 -04:00
Matthew Chen
737503549d Rework incoming read receipts handling.
// FREEBIE
2017-09-19 17:30:48 -04:00
Matthew Chen
2b1ea19960 Modify read receipt photos to support sending read receipts to both linked devices and senders.
// FREEBIE
2017-09-19 17:30:48 -04:00
Matthew Chen
0e7eaf7c62 Modify read receipt photos to support sending read receipts to both linked devices and senders.
// FREEBIE
2017-09-19 17:30:48 -04:00
Matthew Chen
3367292ba0 Merge branch 'hotfix/2.16.1' 2017-09-19 17:25:24 -04:00
Matthew Chen
8f2eb7adf1 Merge branch 'charlesmchen/improveStartupLogging' into hotfix/2.16.1 2017-09-19 17:23:14 -04:00
Matthew Chen
f92b221e6b Startup logging.
// FREEBIE
2017-09-19 17:22:56 -04:00
Matthew Chen
70602e3bca Startup logging.
// FREEBIE
2017-09-19 17:22:56 -04:00
Michael Kirk
7101d4aa3b bump build
// FREEBIE
2017-09-19 11:34:09 -04:00
Michael Kirk
7f6c27863f pull latest translations
// FREEBIE
2017-09-19 11:34:09 -04:00
Michael Kirk
3ead1c0d81 Merge pull request #2553 from WhisperSystems/mkirk-hotfix-2.16.1/pick-any-profile-photo
Show album organizer for profile picker
2017-09-19 10:54:23 -04:00
Michael Kirk
5e878b486e Show album organizer for profile picker
This is in line with attachment picking and let's the user find photos
outside of "moments".

// FREEBIE
2017-09-19 10:47:15 -04:00
Matthew Chen
05cc84ee11 Merge branch 'charlesmchen/flatButtonCR' 2017-09-19 09:41:16 -04:00
Matthew Chen
2affcd934f Respond to CR.
// FREEBIE
2017-09-19 09:40:29 -04:00
Matthew Chen
8ceca76453 Merge branch 'charlesmchen/modalActivityIndicatorCR' 2017-09-19 09:39:56 -04:00
Matthew Chen
c0f5bda2be Respond to CR.
// FREEBIE
2017-09-19 09:39:38 -04:00
Matthew Chen
90eebb3d7d Merge branch 'charlesmchen/lazyLoadAttachmentsCR' 2017-09-19 09:36:21 -04:00
Matthew Chen
a5ece18e6c Fix build break.
// FREEBIE
2017-09-19 09:35:33 -04:00
Matthew Chen
400f536e37 Respond to CR.
// FREEBIE
2017-09-19 09:30:01 -04:00
Matthew Chen
872ce17dd6 Clean up data source temp files when complete.
// FREEBIE
2017-09-19 09:30:01 -04:00
Matthew Chen
92a2fd6b69 Avoid NPEs when entering conversation view.
// FREEBIE
2017-09-19 09:29:36 -04:00
Matthew Chen
cf246a41cf Merge branch 'charlesmchen/profileNotificationsVsConversationView' 2017-09-18 16:37:09 -04:00
Matthew Chen
541966aaf6 Fix NPEs when profiles change while entering conversation view.
// FREEBIE
2017-09-18 16:36:58 -04:00
Matthew Chen
9f803fa440 Merge branch 'charlesmchen/conversationPresentation' 2017-09-18 16:13:01 -04:00
Matthew Chen
2c68b06412 Respond to CR.
// FREEBIE
2017-09-18 16:12:51 -04:00
Matthew Chen
e222b9df68 Normalize conversation presentation logic.
// FREEBIE
2017-09-18 16:08:18 -04:00
Matthew Chen
04d452b074 Normalize conversation presentation logic.
// FREEBIE
2017-09-18 16:08:18 -04:00
Matthew Chen
b6d782046a Normalize conversation presentation logic.
// FREEBIE
2017-09-18 16:08:18 -04:00
Matthew Chen
f3fa107e47 Merge branch 'charlesmchen/callsVsPermissionsCrashes' 2017-09-18 16:06:09 -04:00
Matthew Chen
7b1b532b19 Respond to CR.
// FREEBIE
2017-09-18 16:05:01 -04:00
Matthew Chen
43370ffc3f Fix assert during calls without camera permission.
// FREEBIE
2017-09-18 16:03:03 -04:00
Matthew Chen
e8daf9a8d3 Fix assert when missing camera permission during calls.
// FREEBIE
2017-09-18 16:03:03 -04:00
Matthew Chen
9ee25fd607 Merge branch 'charlesmchen/pullToRefreshContacts' 2017-09-18 15:58:23 -04:00
Matthew Chen
563753a4cb Force contacts intersection in pull-to-refresh from new thread view.
// FREEBIE
2017-09-18 15:56:52 -04:00
Matthew Chen
3aa90451f1 Restore pull-to-refresh in the "new contact thread" view.
// FREEBIE
2017-09-18 15:56:51 -04:00
Matthew Chen
28219008b7 Merge branch 'charlesmchen/linkedDeviceSendVsScrollState' 2017-09-18 15:49:59 -04:00
Matthew Chen
05b1818874 Don't "scroll to bottom" when messages are sent from desktop.
// FREEBIE
2017-09-18 15:49:33 -04:00
Matthew Chen
48121e5eac Don't "scroll to bottom" when messages are sent from desktop.
// FREEBIE
2017-09-18 15:49:32 -04:00
Matthew Chen
95c5a907f4 Bump build to 2.16.1.1.
// FREEBIE
2017-09-18 15:26:25 -04:00
Matthew Chen
f1d8d7ac7d Update l10n strings.
// FREEBI
2017-09-18 15:26:20 -04:00
Michael Kirk
894c7b3da6 Merge branch 'mkirk/update-support-url' 2017-09-18 14:34:56 -04:00
Michael Kirk
4997b4e332 update to new support URL
// FREEBIE
2017-09-18 14:34:52 -04:00