Michael Kirk
|
70b68f5412
|
sync translations
|
2019-03-29 13:35:13 -06:00 |
|
Michael Kirk
|
1ad30f4425
|
Merge branch 'mkirk/long-text-notification' into release/2.38.0
|
2019-03-29 13:31:34 -06:00 |
|
Michael Kirk
|
2242dd240f
|
Fix "blank notification text" for oversize messages
|
2019-03-29 13:31:27 -06:00 |
|
Matthew Chen
|
85b42865df
|
Merge branch 'charlesmchen/conversationScrollVsAppeared' into release/2.38.0
|
2019-03-29 15:30:15 -04:00 |
|
Matthew Chen
|
8f7ad79506
|
Only update scroll state to reflect keyboard changes if view has appeared.
|
2019-03-29 15:29:54 -04:00 |
|
Matthew Chen
|
61740b89e8
|
Merge branch 'charlesmchen/typingAnimationsVsBackground' into release/2.38.0
|
2019-03-29 15:00:04 -04:00 |
|
Matthew Chen
|
746fd278da
|
Restart typing indicators animations after app returns from background.
|
2019-03-29 14:59:46 -04:00 |
|
Michael Kirk
|
a98bfee645
|
Merge branch 'mkirk/highlight-pattern' into release/2.38.0
|
2019-03-29 12:38:44 -06:00 |
|
Michael Kirk
|
5b77bc5475
|
sleep hack for iOS9
|
2019-03-29 12:38:01 -06:00 |
|
Michael Kirk
|
05d8846f6c
|
match highlight behavior with search behavior
|
2019-03-29 12:38:01 -06:00 |
|
Michael Kirk
|
8caff1a535
|
Merge branch 'mkirk/ios9-assert' into release/2.38.0
|
2019-03-29 12:36:56 -06:00 |
|
Michael Kirk
|
5ed16355d7
|
iOS9 needs a different assertion
|
2019-03-29 12:36:33 -06:00 |
|
Michael Kirk
|
00cc4aa005
|
Merge branch 'mkirk/timestamp-parsing' into release/2.38.0
|
2019-03-29 10:33:51 -06:00 |
|
Michael Kirk
|
048f19c6b8
|
specify yyyy date format
|
2019-03-29 10:33:32 -06:00 |
|
Michael Kirk
|
5e52d66b05
|
bump feedback endpoint
|
2019-03-29 10:33:32 -06:00 |
|
Michael Kirk
|
0d822597a1
|
specify locale when timestamp parsing
|
2019-03-29 10:33:32 -06:00 |
|
Matthew Chen
|
033f5fe2df
|
Merge branch 'charlesmchen/imageEditorVsFirstResponder2' into release/2.38.0
|
2019-03-28 18:31:16 -04:00 |
|
Matthew Chen
|
a3efb58d15
|
Respond to CR.
|
2019-03-28 18:29:19 -04:00 |
|
Matthew Chen
|
517a550593
|
Further improve "first responder" behavior in the image editor.
|
2019-03-28 18:06:35 -04:00 |
|
Matthew Chen
|
d3869af067
|
Merge branch 'charlesmchen/imageEditorVsFirstResponder' into release/2.38.0
|
2019-03-28 18:05:57 -04:00 |
|
Matthew Chen
|
eb5cf3978c
|
Fix first responder issue in image editor.
|
2019-03-28 18:05:46 -04:00 |
|
Matthew Chen
|
7b38c9300f
|
Merge branch 'charlesmchen/notificationsForOpenConversations' into release/2.38.0
|
2019-03-28 18:02:08 -04:00 |
|
Matthew Chen
|
aad5533127
|
Respond to CR.
|
2019-03-28 18:01:49 -04:00 |
|
Matthew Chen
|
01d9993b9d
|
Handle notifications for open conversations.
|
2019-03-28 17:03:10 -04:00 |
|
Matthew Chen
|
f3d0cd99fc
|
Handle notifications for open conversations.
|
2019-03-28 16:58:02 -04:00 |
|
Matthew Chen
|
4e8e41c327
|
Merge branch 'charlesmchen/tempFiles'
|
2019-03-27 13:18:47 -04:00 |
|
Matthew Chen
|
dd54b40bed
|
Respond to CR.
|
2019-03-27 13:15:26 -04:00 |
|
Matthew Chen
|
987726df6c
|
Temp files.
|
2019-03-27 12:37:22 -04:00 |
|
Matthew Chen
|
7358ab676d
|
Merge branch 'charlesmchen/linkPreviewCleanup'
|
2019-03-27 12:36:52 -04:00 |
|
Matthew Chen
|
81e3dfc3cf
|
Respond to CR.
|
2019-03-27 12:36:39 -04:00 |
|
Matthew Chen
|
bb1921afe6
|
Simplify link preview cache.
|
2019-03-27 12:35:47 -04:00 |
|
Matthew Chen
|
04b60677a6
|
Simplify link preview cache.
|
2019-03-27 12:35:47 -04:00 |
|
Matthew Chen
|
ae5cee2167
|
Clean up the link preview cache.
|
2019-03-27 12:35:47 -04:00 |
|
Matthew Chen
|
f6ca66f9c6
|
Merge branch 'charlesmchen/removeScrollUpButton'
|
2019-03-27 10:49:39 -04:00 |
|
Matthew Chen
|
0d9b780f75
|
Remove scroll up button.
|
2019-03-27 10:41:48 -04:00 |
|
Michael Kirk
|
3ed2e76eb4
|
"Bump build to 2.38.0.9."
|
2019-03-26 21:45:03 -06:00 |
|
Michael Kirk
|
d02152cf14
|
fix release build
|
2019-03-26 21:44:59 -06:00 |
|
Michael Kirk
|
dc87ae821d
|
"Bump build to 2.38.0.8."
|
2019-03-26 21:27:06 -06:00 |
|
Michael Kirk
|
ab91fedc3e
|
sync translations
|
2019-03-26 21:26:59 -06:00 |
|
Michael Kirk
|
4068496644
|
Merge branch 'charlesmchen/imageEditorVsCaptions'
|
2019-03-26 21:24:28 -06:00 |
|
Matthew Chen
|
db958f4a01
|
Preserve caption text of edited images.
|
2019-03-26 21:24:25 -06:00 |
|
Michael Kirk
|
04ec6b9ddb
|
Merge branch 'charlesmchen/imageEditorRenderingLayerOrder'
|
2019-03-26 21:22:42 -06:00 |
|
Matthew Chen
|
d9760b6bbc
|
Fix bug around layer ordering when rendering image editor output.
|
2019-03-26 21:22:35 -06:00 |
|
Michael Kirk
|
9835c68ec4
|
Merge branch 'charlesmchen/ensureTextItemOnCanvas'
|
2019-03-26 21:21:55 -06:00 |
|
Matthew Chen
|
5973c326de
|
Ensure new text items are on the canvas.
|
2019-03-26 21:21:52 -06:00 |
|
Michael Kirk
|
675c60bf4e
|
Merge branch 'mkirk/fix-ios9-sae-crash'
|
2019-03-26 17:08:53 -06:00 |
|
Michael Kirk
|
f8244eeefe
|
Fix SAE crash for iOS9
|
2019-03-26 17:08:36 -06:00 |
|
Michael Kirk
|
840c811b95
|
Merge branch 'mkirk/ios9-deprecation'
|
2019-03-26 17:07:35 -06:00 |
|
Michael Kirk
|
58d99a480f
|
Notify iOS9 users occasionally that iOS10 will soon be required
|
2019-03-26 11:21:30 -06:00 |
|
Matthew Chen
|
53299c139f
|
Merge branch 'charlesmchen/cdsFeedbackErrors'
|
2019-03-25 15:58:42 -04:00 |
|