Commit Graph

22799 Commits

Author SHA1 Message Date
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
Matthew Chen
2824892b6e Merge branch 'charlesmchen/postRegistration' 2017-09-14 15:55:07 -04:00
Matthew Chen
0b772b3a37 Move post-registration work from view to app delegate.
// FREEBIE
2017-09-14 15:29:59 -04:00
Matthew Chen
b39aa3b914 Merge branch 'charlesmchen/flatButton' 2017-09-12 14:46:07 -04:00
Matthew Chen
9ee72756ae Create Flat UI rounded button class.
// FREEBIE
2017-09-12 14:45:57 -04:00
Matthew Chen
46d00383fd Create Flat UI rounded button class.
// FREEBIE
2017-09-12 14:45:57 -04:00
Matthew Chen
3993035d98 Create Flat UI rounded button class.
// FREEBIE
2017-09-12 14:45:57 -04:00
Matthew Chen
5be2014ec7 Create Flat UI rounded button class.
// FREEBIE
2017-09-12 14:45:57 -04:00
Matthew Chen
c95ff44ea4 Merge branch 'charlesmchen/modalActivityIndicator' 2017-09-12 11:06:48 -04:00
Matthew Chen
ab00342d67 Add modal activity indicator view.
// FREEBIE
2017-09-11 12:49:14 -04:00
Matthew Chen
b0186754b8 Merge branch 'charlesmchen/lazyLoadAttachments' 2017-09-11 10:21:25 -04:00
Matthew Chen
bb2a822f3f Clean up the data source class.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
d3ad0950ba Clean up the data source class.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
b8573d7323 Apply OWSFail() in more places.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
9dfebb2d4b Apply OWSFail() in more places.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
c21a7673c8 Rework preservation of attachment filenames.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
0746b1300d Apply DataSource to message sender.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
b95b5f69de Apply DataSource to message sender.
// FREEBIE
2017-09-11 10:20:48 -04:00
Matthew Chen
20e5013aae Convert DataSource to Objective-C.
// FREEBIE
2017-09-11 10:20:48 -04:00