Commit Graph

11352 Commits

Author SHA1 Message Date
Michael Kirk 9c9545b408 update tags to ignore 2019-04-03 11:02:19 -06:00
Michael Kirk de61d80e67 Merge branch 'mkirk/rotate-recording-bar' into release/2.38.1 2019-04-03 10:55:38 -06:00
Michael Kirk 5e96769a12 resize voice note bar with rotation 2019-04-03 10:55:33 -06:00
Michael Kirk b8b630b275 Merge branch 'mkirk/fix-faded-recording-bar' into release/2.38.1 2019-04-03 10:55:01 -06:00
Michael Kirk 63907acb54 Don't update "cancel" status when locked 2019-04-03 10:54:54 -06:00
Michael Kirk 2e1d805dd5 Merge branch 'mkirk/ios9-hack-restore-input-view' into release/2.38.1 2019-04-03 10:53:18 -06:00
Michael Kirk 8ead2cc83d fix overzealous assert 2019-04-03 10:53:08 -06:00
Michael Kirk fdc9db3487 iOS9 workaround to restore input view after sending captioned attachment 2019-04-03 10:52:00 -06:00
Michael Kirk d06280a270 "Bump build to 2.38.1.0." 2019-04-03 06:28:38 -06:00
Michael Kirk 58cf7d5eba Merge branch 'mkirk/fronting' into release/2.38.1 2019-04-03 06:28:04 -06:00
Michael Kirk 1fae83a777 respect any CDN headers (eg Host for front) 2019-04-02 20:01:04 -06:00
Michael Kirk 3fb8b02b3b update front 2019-04-02 19:57:38 -06:00
Michael Kirk 3b0d6991e1 "Bump build to 2.38.0.11." 2019-04-01 13:59:17 -06:00
Michael Kirk 1d959792e8 sync translations 2019-04-01 13:59:05 -06:00
Michael Kirk e69494450b put conversation search behind feature flag 2019-04-01 13:56:27 -06:00
Michael Kirk e42192624f fixup tests 2019-03-29 15:43:08 -06:00
Michael Kirk 6c4dbfbc4c "Bump build to 2.38.0.10." 2019-03-29 13:35:35 -06:00
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