Commit Graph

1616 Commits

Author SHA1 Message Date
Matthew Chen
bf02bd2cc8 Merge branch 'charlesmchen/deferNotifications' 2017-04-12 10:03:41 -04:00
Matthew Chen
2a369273c8 Respond to CR.
// FREEBIE
2017-04-12 10:03:09 -04:00
Matthew Chen
b7b5dbb563 Do not present local notifications if a read receipt arrives immediately after.
// FREEBIE
2017-04-12 09:46:53 -04:00
Matthew Chen
0115eb8475 Merge branch 'charlesmchen/blockOffer' 2017-04-12 09:16:13 -04:00
Matthew Chen
1d2e5d218d [SSK] Create block offer when non-contacts send you a message.
// FREEBIE
2017-04-12 08:42:22 -04:00
Matthew Chen
55706e9bb9 Respond to CR.
// FREEBIE
2017-04-12 08:38:54 -04:00
Matthew Chen
878704cb12 Create block offer when non-contacts send you a message.
// FREEBIE
2017-04-12 08:38:54 -04:00
Matthew Chen
f6baf1f516 Merge branch 'charlesmchen/approveAllAttachments' 2017-04-11 18:19:40 -04:00
Matthew Chen
c2e94f57ed Respond to CR.
// FREEBIE
2017-04-11 18:18:50 -04:00
Matthew Chen
660e4dd4c4 Show attachment approval dialog for all attachments.
// FREEBIE
2017-04-11 18:17:43 -04:00
Matthew Chen
255b3023f5 Merge branch 'charlesmchen/messageViewGlitches2' 2017-04-11 18:09:55 -04:00
Matthew Chen
5bc5e00156 Add debug UI action to send 1,000 messages so we can “load test” message view’s perf.
// FREEBIE
2017-04-11 18:09:45 -04:00
Matthew Chen
1ac487835a Reload data and invalidate layout whenever message view returns from background.
// FREEBIE
2017-04-11 18:09:45 -04:00
Matthew Chen
5af43580bc Merge branch 'charlesmchen/license' 2017-04-11 18:09:22 -04:00
Matthew Chen
25d97a1304 Update license.
// FREEBIE
2017-04-11 18:09:16 -04:00
Matthew Chen
21f5bc2fce Merge branch 'charlesmchen/editMenuVsAttachmentUpload' 2017-04-11 18:07:45 -04:00
Matthew Chen
435a42bb3c Hide the edit menu for attachment until they are uploaded.
// FREEBIE
2017-04-11 18:07:38 -04:00
Matthew Chen
f36316c609 Merge branch 'charlesmchen/blockWarningMessages' 2017-04-11 18:04:54 -04:00
Matthew Chen
0a8c9e5622 Respond to CR.
// FREEBIE
2017-04-11 18:04:44 -04:00
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
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
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
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
Matthew Chen
a15e8b2d9b Merge branch 'charlesmchen/cantBlockSelf' 2017-04-07 13:02:40 -04:00
Matthew Chen
4cd1684ded Don’t let user block themselves.
// FREEBIE
2017-04-07 13:02:30 -04:00
Matthew Chen
372d6b9bfd Don’t let user block themselves.
// FREEBIE
2017-04-07 13:02:30 -04:00
Matthew Chen
df58a01330 Revert "Fix i18n key."
This reverts commit 0ba81588ed.
2017-04-07 12:09:08 -04:00
Matthew Chen
e3fb0c5987 Merge branch 'charlesmchen/multipleItemsInPasteboard' 2017-04-07 12:04:10 -04:00
Matthew Chen
1ab4417687 Fix paste when pasteboard has multiple items.
// FREEBIE
2017-04-07 12:04:04 -04:00