25d97a1304
Update license.
...
// FREEBIE
2017-04-11 18:09:16 -04:00
21f5bc2fce
Merge branch 'charlesmchen/editMenuVsAttachmentUpload'
2017-04-11 18:07:45 -04:00
435a42bb3c
Hide the edit menu for attachment until they are uploaded.
...
// FREEBIE
2017-04-11 18:07:38 -04:00
f36316c609
Merge branch 'charlesmchen/blockWarningMessages'
2017-04-11 18:04:54 -04:00
0a8c9e5622
Respond to CR.
...
// FREEBIE
2017-04-11 18:04:44 -04:00
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
61c865a78d
Merge branch 'charlesmchen/preserveScrolledToBottom'
2017-04-11 17:54:54 -04:00
f503d7f93c
Stay scrolled to the bottom during in conversation view during updates.
...
// FREEBIE
2017-04-11 17:46:28 -04:00
6bc979cbcd
Merge branch 'charlesmchen/refineUploadIndicator'
2017-04-11 17:41:19 -04:00
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
8490be6ed9
[SSK] Remove the properties related to Redphone and WebRTC support.
...
// FREEBIE
2017-04-11 17:39:57 -04:00
2fd8a13a3c
[SSK] Improve attachment upload progress indicator.
...
// FREEBIE
2017-04-11 17:39:49 -04:00
37d408cc74
Merge branch 'mkirk/fix-share'
2017-04-11 15:40:23 -04:00
032cf0d953
sharing via message view is legible
...
// FREEBIE
2017-04-11 15:40:17 -04:00
811a4ac4b5
add some missing asserts
...
// FREEBIE
2017-04-11 15:40:17 -04:00
2a7a4aa34f
Merge branch 'mkirk/clarify-verification'
2017-04-11 15:37:19 -04:00
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
fb53a3258d
clarify what to do on the verification screen
...
// FREEBIE
2017-04-11 13:34:47 -04:00
4a128e69a6
Merge branch 'mkirk/sync-unread-count'
2017-04-10 19:31:52 -04:00
91fc6b4d04
Stretch to fit wider message counts
...
// FREEBIE
2017-04-10 19:31:40 -04:00
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
6b0eb7f9b5
Use numeric pad for verifiation code entry
...
No need for special phone characters like: *, -, +
// FREEBIE
2017-04-10 19:01:10 -04:00
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
dfd4ff5d2e
Merge branch 'charlesmchen/messageViewGlitches'
2017-04-10 12:44:13 -04:00
6fde2852b1
Respond to CR.
...
// FREEBIE
2017-04-10 12:44:03 -04:00
dc78e32bbf
Reload data and invalidate layout whenever message view will appear.
...
// FREEBIE
2017-04-10 12:42:37 -04:00
0039f4b697
sync translations
...
// FREEBIE
2017-04-07 15:11:32 -04:00
1849c8531f
bump build
...
// FREEBIE
2017-04-07 15:10:28 -04:00
2af89c9a2e
[SSK][SPK] only assert dispatch in DEBUG
...
// FREEBIE
2017-04-07 14:20:35 -04:00
a93aad5124
Respond to CR.
...
// FREEBIE
2017-04-07 13:03:22 -04:00
a15e8b2d9b
Merge branch 'charlesmchen/cantBlockSelf'
2017-04-07 13:02:40 -04:00
4cd1684ded
Don’t let user block themselves.
...
// FREEBIE
2017-04-07 13:02:30 -04:00
372d6b9bfd
Don’t let user block themselves.
...
// FREEBIE
2017-04-07 13:02:30 -04:00
df58a01330
Revert "Fix i18n key."
...
This reverts commit 0ba81588ed
2017-04-07 12:09:08 -04:00
e3fb0c5987
Merge branch 'charlesmchen/multipleItemsInPasteboard'
2017-04-07 12:04:10 -04:00
1ab4417687
Fix paste when pasteboard has multiple items.
...
// FREEBIE
2017-04-07 12:04:04 -04:00
d3bcc4e4da
Merge branch 'charlesmchen/roundAvatarIcons'
2017-04-07 11:58:24 -04:00
27aeb425e4
Round avatar icons.
...
// FREEBIE
2017-04-07 11:58:15 -04:00
7fb795491c
Merge branch 'charlesmchen/fingerprintViewVsKeyboard'
2017-04-07 11:54:51 -04:00
3ac1e75b5f
Ensure keyboard doesn't hide "safety numbers changed" interaction.
...
// FREEBIE
2017-04-07 11:54:42 -04:00
0bc8a0f373
Merge branch 'charlesmchen/reformatPhoneNumberVsCountryCodeChange'
2017-04-07 11:52:30 -04:00
5feca42821
Reformat phone number if user changes country code.
...
// FREEBIE
2017-04-07 11:52:21 -04:00
df381cf4b9
Merge branch 'mkirk/session-cleanup'
2017-04-07 11:23:49 -04:00
6ba5e5cc6b
Clean up session-reset logging
...
// FREEBIE
2017-04-07 10:19:40 -04:00
0ba81588ed
Fix i18n key.
...
// FREEBIE
2017-04-06 22:09:23 -04:00
8c5ceffe17
sync translations
...
// FREEBIE
2017-04-06 21:19:19 -04:00
24adac289c
bump version
...
// FREEBIE
2017-04-06 21:11:01 -04:00
e8056fcbb2
Merge branch 'mkirk/fix-session-reset'
2017-04-06 21:10:42 -04:00
d8ae941736
Delete session *before* sending EndSession message
...
Typically we're sending an EndSession message because our session has
diverged from the remote party's session. So if we send an EndSession
message, but decrypt it with our old out-of-sync session, how can we
expect them to be able to decrypt it?
Instead, by deleting the existing sessions, we'll fetch a new PreKey,
and start fresh with the remote side.
// FREEBIE
2017-04-06 21:09:56 -04:00
9d0c76ca56
debug action to reset session
...
// FREEBIE
2017-04-06 21:09:56 -04:00
Matthew Chen
Michael Kirk