Matthew Chen
4e3fbac107
Add explanation messages to the “block user alert” and the block section of the 1:1 conversation settings view.
...
// FREEBIE
2017-04-11 18:00:01 -04:00
Matthew Chen
61c865a78d
Merge branch 'charlesmchen/preserveScrolledToBottom'
2017-04-11 17:54:54 -04:00
Matthew Chen
f503d7f93c
Stay scrolled to the bottom during in conversation view during updates.
...
// FREEBIE
2017-04-11 17:46:28 -04:00
Matthew Chen
6bc979cbcd
Merge branch 'charlesmchen/refineUploadIndicator'
2017-04-11 17:41:19 -04:00
Matthew Chen
ec129ea217
Improve attachment upload progress indicator.
...
* Should never show up for attachments in the failed state.
* Show show up without delay for attachments being sent.
* Show disappear when attachment upload fails in any way.
// FREEBIE
2017-04-11 17:41:05 -04:00
Matthew Chen
8490be6ed9
[SSK] Remove the properties related to Redphone and WebRTC support.
...
// FREEBIE
2017-04-11 17:39:57 -04:00
Matthew Chen
2fd8a13a3c
[SSK] Improve attachment upload progress indicator.
...
// FREEBIE
2017-04-11 17:39:49 -04:00
Matthew Chen
adee71ba9b
Merge branch 'charlesmchen/voiceAndWebrtcDefaults'
2017-04-11 17:23:31 -04:00
Matthew Chen
d89d4dea8a
Remove the properties related to Redphone and WebRTC support.
...
// FREEBIE
2017-04-11 17:23:20 -04:00
Matthew Chen
59a7b02de3
Merge branch 'charlesmchen/refineUploadIndicator'
2017-04-11 17:18:19 -04:00
Matthew Chen
e28a81e6ad
Improve attachment upload progress indicator.
...
* Should never show up for attachments in the failed state.
* Show show up without delay for attachments being sent.
* Show disappear when attachment upload fails in any way.
// FREEBIE
2017-04-11 17:18:07 -04:00
Matthew Chen
74ade28173
Merge branch 'charlesmchen/license'
2017-04-11 17:16:52 -04:00
Matthew Chen
009dac0b5d
Update license.
...
// FREEBIE
2017-04-11 17:16:04 -04:00
Michael Kirk
2f28441a5d
bump build
...
// FREEBIE
2017-04-11 15:51:49 -04:00
Matthew Chen
99c218f2d9
[SSK] Fix file extensions for arbitrary file types.
...
// FREEBIE
2017-04-11 15:44:22 -04:00
Matthew Chen
1beac56989
Merge branch 'charlesmchen/fixArbitraryAttachmentDownloads'
2017-04-11 15:42:47 -04:00
Michael Kirk
37d408cc74
Merge branch 'mkirk/fix-share'
2017-04-11 15:40:23 -04:00
Michael Kirk
032cf0d953
sharing via message view is legible
...
// FREEBIE
2017-04-11 15:40:17 -04:00
Michael Kirk
811a4ac4b5
add some missing asserts
...
// FREEBIE
2017-04-11 15:40:17 -04:00
Michael Kirk
2a7a4aa34f
Merge branch 'mkirk/clarify-verification'
2017-04-11 15:37:19 -04:00
Michael Kirk
ca768d071a
repeat phone number in header, next to back button
...
1. Putting it near the back-button suggests the user can change it by
going back.
2. The existing title "Verify" didn't add any value.
// FREEBIE
2017-04-11 13:34:47 -04:00
Michael Kirk
fb53a3258d
clarify what to do on the verification screen
...
// FREEBIE
2017-04-11 13:34:47 -04:00
Matthew Chen
f08d779f4d
Fix file extensions for arbitrary file types.
...
// FREEBIE
2017-04-11 13:18:56 -04:00
Michael Kirk
eb3526b525
bump build
...
// FREEBIE
2017-04-11 10:30:24 -04:00
Matthew Chen
622a757ec8
Merge branch 'charlesmchen/fixAudioPlayback' into hotfix/2.10.1
2017-04-11 10:25:36 -04:00
Matthew Chen
847a610645
[SSK] Fix audio playback.
...
// FREEBIE
2017-04-11 10:24:49 -04:00
Matthew Chen
7f2ce61424
Merge branch 'charlesmchen/fixAudioPlayback'
2017-04-11 10:23:41 -04:00
Matthew Chen
79a2612dbe
Fix audio playback.
...
// FREEBIE
2017-04-11 09:47:53 -04:00
Matthew Chen
8458fb69a4
Fix audio playback.
...
// FREEBIE
2017-04-11 09:47:49 -04:00
Matthew Chen
e6cd3d0712
Fix audio playback.
...
// FREEBIE
2017-04-11 09:15:25 -04:00
Michael Kirk
99f49dffff
Pull latest translations
...
// FREEBIE
2017-04-10 23:00:50 -04:00
Michael Kirk
4788d0b141
[SSK] Don't mark messages as failed prematurely
...
Previously we were marking on first failure, meaning we might still be
retrying, but we only want to mark as failed after we've stopped
retrying (or if it's a non-retryable failure).
// FREEBIE
2017-04-10 22:11:26 -04:00
Michael Kirk
207b29e7f3
bump version
...
// FREEBIE
2017-04-10 22:09:06 -04:00
Michael Kirk
4a128e69a6
Merge branch 'mkirk/sync-unread-count'
2017-04-10 19:31:52 -04:00
Michael Kirk
91fc6b4d04
Stretch to fit wider message counts
...
// FREEBIE
2017-04-10 19:31:40 -04:00
Michael Kirk
9bd2ff0572
Don't repaint back-button unread badge
...
There's not much benefit to this being done async, and making it sync
avoids the repaint.
Also, simplified the code around drawing the badge.
// FREEBIE
2017-04-10 19:04:14 -04:00
Michael Kirk
6b0eb7f9b5
Use numeric pad for verifiation code entry
...
No need for special phone characters like: *, -, +
// FREEBIE
2017-04-10 19:01:10 -04:00
Michael Kirk
7fb8b493f1
bail on scripts whenever an error is encountered
...
remove unused script
also use consistent bash
// FREEBIE
2017-04-10 18:56:22 -04:00
Matthew Chen
dfd4ff5d2e
Merge branch 'charlesmchen/messageViewGlitches'
2017-04-10 12:44:13 -04:00
Matthew Chen
6fde2852b1
Respond to CR.
...
// FREEBIE
2017-04-10 12:44:03 -04:00
Matthew Chen
dc78e32bbf
Reload data and invalidate layout whenever message view will appear.
...
// FREEBIE
2017-04-10 12:42:37 -04:00
Matthew Chen
d4e0c49ff9
Merge branch 'charlesmchen/attachmentRetryVsFailure'
2017-04-10 12:35:51 -04:00
Matthew Chen
004a952bc0
Respond to CR.
...
// FREEBIE
2017-04-10 12:35:30 -04:00
Matthew Chen
8258f26aec
Don’t mark messages as failed until all retries are exhausted.
...
// FREEBIE
2017-04-10 10:35:43 -04:00
Michael Kirk
0039f4b697
sync translations
...
// FREEBIE
2017-04-07 15:11:32 -04:00
Michael Kirk
1849c8531f
bump build
...
// FREEBIE
2017-04-07 15:10:28 -04:00
Michael Kirk
2af89c9a2e
[SSK][SPK] only assert dispatch in DEBUG
...
// FREEBIE
2017-04-07 14:20:35 -04:00
Matthew Chen
a93aad5124
Respond to CR.
...
// FREEBIE
2017-04-07 13:03:22 -04:00
Michael Kirk
19d8a32022
Merge pull request #163 from WhisperSystems/mkirk/debug-asserts
...
only assert queues in debug
2017-04-07 13:02:42 -04:00
Matthew Chen
a15e8b2d9b
Merge branch 'charlesmchen/cantBlockSelf'
2017-04-07 13:02:40 -04:00
