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
Matthew Chen
4a4882ebe5
Add debug notification.
2018-05-10 17:11:42 -04:00
Matthew Chen
408b8d01cc
Merge branch 'charlesmchen/multipleLocalNotifications'
2018-05-10 16:36:57 -04:00
Matthew Chen
a3c853066a
Respond to CR.
2018-05-10 16:36:37 -04:00
Matthew Chen
f95151ac8d
Don't present multiple converastion views ever.
2018-05-10 16:35:46 -04:00
Matthew Chen
940161e62f
Don't process multiple local notifications.
2018-05-10 16:35:46 -04:00
Matthew Chen
b751a32536
"Bump build to 2.25.0.14."
2018-05-10 14:43:19 -04:00
Matthew Chen
faf15e3c8e
Update l10n strings.
2018-05-10 14:43:04 -04:00
Matthew Chen
ccc64e62bf
Fix l10n strings.
2018-05-10 14:40:49 -04:00
Michael Kirk
6ab0d81c30
Merge branch 'mkirk/contact-reply'
2018-05-10 14:34:41 -04:00
Michael Kirk
2cc3eabdb8
quote reply to contact share (no avatar)
...
// FREEBIE
2018-05-10 14:34:19 -04:00
Michael Kirk
742492dd32
remove redundant protocol definition
...
`debugDescription` is defined on all NSObjects (but as a property)
// FREEBIE
2018-05-10 13:42:37 -04:00
Matthew Chen
5a80001878
Merge branch 'charlesmchen/mergeOrganizationName'
2018-05-10 13:39:13 -04:00
Matthew Chen
8cdb75d52a
Respond to CR.
2018-05-10 13:38:39 -04:00
Matthew Chen
8337c3bd68
Refine contact merging.
2018-05-10 13:36:38 -04:00
Matthew Chen
8eef940baa
Merge branch 'charlesmchen/addToContactsAlways'
2018-05-10 13:35:54 -04:00
Matthew Chen
c05c1ac879
Always show 'add to contacts' button.
2018-05-10 13:35:41 -04:00
Michael Kirk
52b5021383
Merge branch 'mkirk/show-avatar-in-approval'
2018-05-10 13:34:36 -04:00
Michael Kirk
d1c33921ba
Show avatar in contact approval view
...
// FREEBIE
2018-05-10 13:34:28 -04:00
Matthew Chen
46ce2d6f80
Merge branch 'charlesmchen/shareContactSinglePresentation'
2018-05-10 13:17:43 -04:00