Commit graph

4034 commits

Author SHA1 Message Date
Matthew Chen
948da2afbb Merge remote-tracking branch 'origin/release/2.16.0' 2017-09-07 15:20:45 -04:00
Matthew Chen
7d53778755 Merge branch 'charlesmchen/conversationBackButtonHotArea' 2017-09-07 13:54:22 -04:00
Matthew Chen
df2bf63384 Fix back button width on iOS 11.
// FREEBIE
2017-09-07 13:49:32 -04:00
Matthew Chen
43a2b9ebe3 Bump build to 2.16.0.20.
// FREEBIE
2017-09-07 13:34:31 -04:00
Michael Kirk
5d58f43837 More profile logging
// FREEBIE
2017-09-07 13:32:45 -04:00
Matthew Chen
3d5836a768 Bump build to 2.16.0.19.
// FREEBIE
2017-09-07 13:26:47 -04:00
Michael Kirk
066cc411f1 Merge branch 'mkirk-2.16.0/fix-no-profile-crash' into release/2.16.0 2017-09-07 13:24:22 -04:00
Michael Kirk
04bf548a7b Fix one-time crash when opening thread without having a local profile
// FREEBIE
2017-09-07 13:24:15 -04:00
Matthew Chen
2bd50a7bf1 Bump build to 2.16.0.18.
// FREEBIE
2017-09-07 11:26:40 -04:00
Matthew Chen
60ab8bd049 Update l10n strings.
// FREEBIE
2017-09-07 11:26:21 -04:00
Michael Kirk
628dd80559 Merge branch 'mkirk-2.16.0/fix-nav-controller' into release/2.16.0 2017-09-07 11:21:43 -04:00
Michael Kirk
25a2646c8b Always present settings from OWSNavigationController
// FREEBIE
2017-09-07 11:06:52 -04:00
Matthew Chen
26a6e76f3c Rework conversation view header.
// FREEBIE
2017-09-07 10:47:35 -04:00
Matthew Chen
b626fb5bf8 Rework conversation view header.
// FREEBIE
2017-09-07 10:36:28 -04:00
Matthew Chen
644f435b16 Rework conversation view header.
// FREEBIE
2017-09-07 10:35:11 -04:00
Matthew Chen
daa8c409e3 Merge branch 'charlesmchen/renameViews' 2017-09-06 14:40:42 -04:00
Matthew Chen
c106794fe8 Rename conversation view.
// FREEBIE
2017-09-06 14:13:18 -04:00
Matthew Chen
928525c31e Rename home view.
// FREEBIE
2017-09-06 13:59:39 -04:00
Matthew Chen
fd4f00fa4d Rename new contact thread view.
// FREEBIE
2017-09-06 13:55:01 -04:00
Matthew Chen
29848835f3 Bump build to 2.16.0.17.
// FREEBIE
2017-09-06 13:33:09 -04:00
Matthew Chen
e6d14db2fb Merge branch 'charlesmchen/pushNotificationsVsConcurency' 2017-09-06 13:32:57 -04:00
Matthew Chen
fc92293da3 Fix build break.
// FREEBIE
2017-09-06 13:32:47 -04:00
Michael Kirk
6911c8047e validate push settings on main thread
// FREEBIE
2017-09-06 13:32:47 -04:00
Matthew Chen
58e6ab60d8 Update l10n strings.
// FREEBIE
2017-09-06 13:32:01 -04:00
Matthew Chen
ddb4d97436 Bump build to 2.16.0.16.
// FREEBIE
2017-09-06 13:07:28 -04:00
Michael Kirk
77760b8adb Merge branch 'mkirk/ios11-images' 2017-09-06 12:12:32 -04:00
Michael Kirk
2d13c49222 [iOS11] Support sending .heif filesS
// FREEBIE
2017-09-06 12:11:54 -04:00
Michael Kirk
83ca34edbe Fix sending images taken on iOS11 camera.
Convert .heic to .jpg upon sending

// FREEBIE
2017-09-06 11:47:01 -04:00
Michael Kirk
454a7c2956 Merge branch 'mkirk/jsq-ios11' 2017-09-06 11:46:45 -04:00
Michael Kirk
ecf8ca093f [JSQMVC] iOS11 compatability
// FREEBIE
2017-09-06 11:46:25 -04:00
Matthew Chen
5170fe09bc Bump build to 2.16.0.15.
// FREEBIE
2017-09-05 17:02:59 -04:00
Michael Kirk
8d4850657b Merge branch 'mkirk/avatar-cropper' 2017-09-05 16:40:29 -04:00
Michael Kirk
d827453f47 copy tweak
// FREEBIE
2017-09-05 16:37:06 -04:00
Matthew Chen
0d04cf251b Ensure the crop view is WYSIWIG.
// FREEBIE
2017-09-05 16:36:42 -04:00
Michael Kirk
4e93bec230 black masking style for avatar cropper
- cancel/done buttons
- no navbar for modal edit
- vertically center image

// FREEBIE
2017-09-05 16:36:42 -04:00
Michael Kirk
79f0c14e29 Merge branch 'mkirk/upgrade-experience' 2017-09-05 16:30:03 -04:00
Michael Kirk
809a9c3d19 copy tweak
// FREEBIE
2017-09-05 16:29:05 -04:00
Michael Kirk
59eb782d57 Optimize layout for profile upgrade, remove other upgrade screens
// FREEBIE
2017-09-05 16:24:33 -04:00
Michael Kirk
0244a82031 code cleanup for clarity
// FREEBIE
2017-09-05 16:24:33 -04:00
Michael Kirk
90b1db9eb4 new upgrade layout
// FREEBIE
2017-09-05 16:24:33 -04:00
Michael Kirk
b7cc1e9f56 top margin iphone5c 2017-09-05 16:24:33 -04:00
Michael Kirk
73a441a28c introducing profiles
// FREEBIE
2017-09-05 16:24:33 -04:00
Matthew Chen
e1e8d05ed8 Merge branch 'charlesmchen/groupVsUserProfileWhitelist' 2017-09-05 12:31:27 -04:00
Matthew Chen
16dcc73b2d Respond to CR.
// FREEBIE
2017-09-05 12:31:19 -04:00
Matthew Chen
2ce66527fb Add group members individual to profile whitelist when adding group.
// FREBIE
2017-09-05 12:30:15 -04:00
Matthew Chen
605ba90bce Merge branch 'charlesmchen/initialConversationRangeSize' 2017-09-05 09:32:20 -04:00
Matthew Chen
6a2d14ad2a Refine message view's initial range size.
// FREEBIE
2017-09-05 09:21:36 -04:00
Matthew Chen
a1cb2c015e Refine message view's initial range size.
// FREEBIE
2017-09-05 09:21:36 -04:00
Matthew Chen
2cd72d64c6 Fix commit messages written by build number script.
// FREEBIE
2017-09-01 18:44:39 -04:00
Matthew Chen
3be347ed2c Bump build from to 2.16.0.13.
// FREEBIE
2017-09-01 18:43:55 -04:00