Commit Graph

2080 Commits

Author SHA1 Message Date
Michael Kirk
d211e62387 Merge branch 'mkirk/fix-no-contacts-flicker' 2017-05-17 09:25:13 -04:00
Michael Kirk
c31fd0dfcc Fix flicker of "no contacts" screen on message compose
// FREEBIE
2017-05-17 09:24:59 -04:00
Matthew Chen
74a0e285a6 Merge branch 'charlesmchen/graySettingsButtons' 2017-05-17 09:13:58 -04:00
Matthew Chen
9dc1847ca9 Change conversation settings buttons to gray.
// FREEBIE
2017-05-16 16:40:40 -04:00
Michael Kirk
ce002c2280 bump build
// FREEBIE
2017-05-15 18:15:15 -04:00
Michael Kirk
17cff1a26d Revert "Merge branch 'charlesmchen/bluetoothAudio'"
This reverts commit 48a2005aa2, reversing
changes made to de1332479c.

// FREEBIE
2017-05-15 18:14:51 -04:00
Michael Kirk
b76c3fb1c6 bump build
// FREEBIE
2017-05-15 17:24:57 -04:00
Matthew Chen
48a2005aa2 Merge branch 'charlesmchen/bluetoothAudio' 2017-05-15 17:24:02 -04:00
Matthew Chen
6c9f44b99d Clean up ahead of PR.
// FREEBIE
2017-05-15 17:23:53 -04:00
Matthew Chen
54bf103508 Fix Bluetooth audio when recording voice messages.
// FREEBIE
2017-05-15 17:23:53 -04:00
Matthew Chen
7e18052c45 Fix Bluetooth audio in calls.
// FREEBIE
2017-05-15 17:23:53 -04:00
Michael Kirk
de1332479c bump version
// FREEBIE
2017-05-15 17:08:00 -04:00
Michael Kirk
ef1dc359f8 Merge branch 'mkirk/mic-perms' 2017-05-15 17:07:37 -04:00
Michael Kirk
e727c0a77a update mic perm copy
// FREEBIE
2017-05-15 17:04:01 -04:00
Michael Kirk
16032b9c61 strongSelf per CR
// FREEBIE
2017-05-15 17:03:46 -04:00
Michael Kirk
c56ff7532c Fix confusing double permission request on new install when sending
voice notes

// FREEBIE
2017-05-15 16:51:12 -04:00
Michael Kirk
7861af4fc0 mention voice notes in mic permission request
// FREEBIE
2017-05-15 16:41:34 -04:00
Michael Kirk
b136c5f74c pull latest translations
// FREEBIE
2017-05-15 16:39:00 -04:00
Michael Kirk
72168e2881 [SSK] faster contact parsing
// FREEBIE
2017-05-15 16:38:33 -04:00
Michael Kirk
3ca2d0cbe0 Merge branch 'mkirk/no-signal-accounts' 2017-05-15 16:19:56 -04:00
Michael Kirk
e2b1cbb154 Don't show "no signal accounts" until contact intersection has completed
at least once

// FREEBIE
2017-05-15 16:19:50 -04:00
Matthew Chen
d2911dfc32 Merge branch 'charlesmchen/voiceMessageMimeTypes' 2017-05-15 15:54:07 -04:00
Matthew Chen
fc51768197 Work around m4a vs. mp4 issue for voice messages in legacy iOS clients.
// FREEBIE
2017-05-15 15:52:13 -04:00
Michael Kirk
ab94eaed45 Merge pull request #2118 from WhisperSystems/mkirk/disclosure-icon
Fix disclosure icon direction on iOS9
2017-05-15 13:40:57 -04:00
Michael Kirk
cb1c843979 Fix disclosure icon direction on iOS9
// FREEBIE
2017-05-15 11:34:35 -04:00
Michael Kirk
44eed98995 sync translations
// FREEBIE
2017-05-12 19:27:48 -04:00
Michael Kirk
285a2f64df bump build 2.12.0.2
// FREEBIE
2017-05-12 19:26:22 -04:00
Michael Kirk
20ad9114e2 [SSK] Reduce time between editing contacts and seeing those changes in
the app

cache phone number parsing

// FREEBIE
2017-05-12 19:25:58 -04:00
Matthew Chen
45339a9f94 Merge branch 'charlesmchen/newNonContactConversationVsBlocking' 2017-05-12 19:00:19 -04:00
Matthew Chen
c1a1ea7f3b Let users start new 1:1 conversations with blocked non-contacts found by phone number.
// FREEBIE
2017-05-12 19:00:10 -04:00
Matthew Chen
8a69edb341 Merge branch 'charlesmchen/keyboardVsVoiceMessages' 2017-05-12 18:01:45 -04:00
Matthew Chen
2048b330ac Don't hide keyboard when recording a voice message.
// FREEBIE
2017-05-12 17:58:26 -04:00
Matthew Chen
14689f0252 Merge branch 'charlesmchen/genericAttachmentsAppearance2' 2017-05-12 16:39:48 -04:00
Matthew Chen
00d972db48 Rework appearance of audio and generic attachment messages.
// FREEBIE
2017-05-12 16:39:39 -04:00
Matthew Chen
b8b2ae10a2 Rework appearance of generic attachment messages.
// FREEBIE
2017-05-12 16:39:39 -04:00
Matthew Chen
2c31a0bdb5 Rework appearance of audio messages.
// FREEBIE
2017-05-12 16:39:39 -04:00
Michael Kirk
ea1a1b1015 bump build
//FREEBIE
2017-05-12 16:34:08 -04:00
Michael Kirk
a92538ab9e Sync translations
// FREEBIE
2017-05-12 16:32:40 -04:00
Michael Kirk
ef86629070 Merge branch 'mkirk/clearer-settings-heading' 2017-05-12 16:26:37 -04:00
Michael Kirk
abcc510341 "Conversation Settings" -> "Contact/Group Info"
Clearer heading

// FREEBIE
2017-05-12 16:26:32 -04:00
Michael Kirk
33dc4d3d8a [SSK] Show Voice Message snippet
// FREEBIE
2017-05-12 16:25:47 -04:00
Matthew Chen
09f8a20acb [SSK] Revert "Merge branch 'charlesmchen/autoMarkAsRead'"
// FREEBIE
2017-05-12 16:22:53 -04:00
Matthew Chen
625b1d0200 [SSK] Only reply to group info requester & Don’t reply to “request group info” messages from non-members of the group in question.
// FREEBIE
2017-05-12 16:12:38 -04:00
Michael Kirk
da58eb18ad partial revert of previous pod update
// FREEBIE
2017-05-12 15:52:38 -04:00
Matthew Chen
7f2b1c03ae Merge branch 'charlesmchen/voiceMessageAppearance2' 2017-05-12 15:42:41 -04:00
Matthew Chen
02843958f7 Rework appearance of audio messages.
// FREEBIE
2017-05-12 15:42:32 -04:00
Matthew Chen
c27800c12c Merge branch 'charlesmchen/largerAudioWidth' 2017-05-12 15:40:15 -04:00
Matthew Chen
bcc7007812 Respond to CR.
// FREEBIE
2017-05-12 15:39:57 -04:00
Matthew Chen
e1fba208ae Align photo and audio bubble widths.
// FREEBIE
2017-05-12 15:30:51 -04:00
Matthew Chen
94210960a7 Merge branch 'charlesmchen/duplicatesInNewConversationView' 2017-05-12 14:35:51 -04:00