Commit graph

7018 commits

Author SHA1 Message Date
Matthew Chen 443b3c2886 Merge branch 'charlesmchen/profileKeyProtos' 2018-05-15 16:21:03 -04:00
Matthew Chen b74f545a64 Fix profile key protos. 2018-05-15 16:20:56 -04:00
Michael Kirk 4ba0fde3e9 Merge branch 'mkirk/mark-as-read-fix' 2018-05-15 16:17:10 -04:00
Michael Kirk 54f7373037 Clean up logging, start messages timer regardless of current
configuration

// FREEBIE
2018-05-15 15:13:58 -04:00
Matthew Chen 68d70da194 "Bump build to 2.25.0.20." 2018-05-15 14:13:33 -04:00
Matthew Chen c14a021ae3 Update l10n strings. 2018-05-15 14:13:24 -04:00
Michael Kirk 127224ad23 Merge branch 'mkirk/resume-read-timer-on-activation' 2018-05-15 13:23:29 -04:00
Michael Kirk 30cef1f084 start readtimer whenever we become active
// FREEBIE
2018-05-15 12:56:47 -04:00
Michael Kirk 90289bbf72 Merge branch 'mkirk/nav-bar-style' 2018-05-15 10:04:19 -04:00
Michael Kirk 117d7319d2 Add contact modally and restore navbar style when dismssing contacts
// FREEBIE
2018-05-14 18:40:56 -04:00
Matthew Chen 4949ade274 Revert "Disable contact sharing."
This reverts commit e8b41789d7.
2018-05-14 16:58:33 -04:00
Matthew Chen a376de01ef "Bump build to 2.25.0.19." 2018-05-14 16:58:16 -04:00
Matthew Chen bf205c9df7 Merge branch 'charlesmchen/unregisteredUsers' 2018-05-14 16:57:04 -04:00
Matthew Chen e6dceffdbd Respond to CR. 2018-05-14 16:56:49 -04:00
Matthew Chen 5c7b98e5c4 Improve handling of unregistered users. 2018-05-14 16:45:06 -04:00
Matthew Chen d81e400693 Update l10n strings. 2018-05-14 16:33:59 -04:00
Matthew Chen e8b41789d7 Disable contact sharing. 2018-05-14 16:24:12 -04:00
Matthew Chen 51da7ebdf7 "Bump build to 2.25.0.18." 2018-05-14 15:33:01 -04:00
Matthew Chen 115e6b4c4b Merge branch 'charlesmchen/sendToSentMarkAsSent' 2018-05-14 14:53:31 -04:00
Matthew Chen 8489c55fde Mark send-to-self as sent. 2018-05-14 14:41:45 -04:00
Michael Kirk 9fbcd790f0 Merge branch 'mkirk/fix-cancel-add-crash' 2018-05-14 14:03:39 -04:00
Michael Kirk 704a6f55a0 Fix crash after canceling "Add New Contact"
Text of the exception is:
  "Impossible to set up layout with view hierarchy unprepared for constraint"

Since their container view is pinned to the top layout guide, this
should not change the layout.

// FREEBIE
2018-05-14 14:03:25 -04:00
Matthew Chen ba95034ce7 Merge branch 'charlesmchen/avatarSeed' 2018-05-14 14:00:30 -04:00
Matthew Chen 152e1d7983 Respond to CR. 2018-05-14 14:00:22 -04:00
Matthew Chen ca09d00e2e Use signal id as avatar color seed if possible. 2018-05-14 12:48:07 -04:00
Matthew Chen 6ccce6754c Merge branch 'charlesmchen/loadViewVsScreenLock' 2018-05-14 12:05:27 -04:00
Matthew Chen edabe50678 Respond to CR. 2018-05-14 12:05:14 -04:00
Matthew Chen a26cba3de1 Don't show screen block until app is ready. 2018-05-14 12:05:14 -04:00
Matthew Chen 726da0ca97 Merge branch 'charlesmchen/homeViewFixes' 2018-05-14 12:03:58 -04:00
Matthew Chen aa4345f9c1 Fix edge cases in home view. 2018-05-14 12:03:52 -04:00
Matthew Chen 53fb8787fa Merge branch 'charlesmchen/caseInsensitiveContactSort' 2018-05-14 11:55:37 -04:00
Matthew Chen 0b488f1a65 Use case-insensitive comparison when sorting contacts. 2018-05-14 11:55:30 -04:00
Matthew Chen ed872beda7 Merge branch 'charlesmchen/noEcho' 2018-05-14 11:52:25 -04:00
Matthew Chen 9c2f619132 Don't echo messages sent to self 1:1. 2018-05-14 10:56:47 -04:00
Matthew Chen ad6908174b "Bump build to 2.25.0.17." 2018-05-11 20:20:30 -04:00
Matthew Chen 6b643a0c1b Avoid spurious badge animations. 2018-05-11 20:20:16 -04:00
Matthew Chen 2c80866f8d "Bump build to 2.25.0.16." 2018-05-11 15:52:31 -04:00
Matthew Chen 867b3484dd Update l10n strings. 2018-05-11 15:52:28 -04:00
Matthew Chen ca03203b95 Merge branch 'charlesmchen/debugNotifications2' 2018-05-11 15:48:46 -04:00
Matthew Chen 81a40909f4 Respond to CR. 2018-05-11 15:45:38 -04:00
Matthew Chen 9936003637 Respond to CR. 2018-05-11 15:37:13 -04:00
Matthew Chen 9a4889c4fb Simplify debug notifications. 2018-05-11 15:34:57 -04:00
Matthew Chen 1a170ba484 Simplify debug notifications. 2018-05-11 15:34:57 -04:00
Matthew Chen b9c852378a Merge branch 'charlesmchen/saeLiveImageCrash' 2018-05-11 14:29:40 -04:00
Matthew Chen 73206c08ad Respond to CR. 2018-05-11 14:29:28 -04:00
Matthew Chen 56b91ddebb Clean up ahead of PR. 2018-05-11 11:28:05 -04:00
Matthew Chen b62d6900da Fix crash converting images in SAE. 2018-05-11 11:26:04 -04:00
Matthew Chen 744a3b8be1 "Bump build to 2.25.0.15." 2018-05-10 17:26:29 -04:00
Matthew Chen 3579621db6 Improve logging around home view selection. 2018-05-10 17:25:48 -04:00
Matthew Chen f55012e671 Merge branch 'charlesmchen/debugNotifications' 2018-05-10 17:11:58 -04:00