87094a8fb1
update carthage
2019-04-04 13:44:42 -06:00
b6052045d8
Merge branch 'mkirk/bump-adds-tag'
2019-04-04 13:44:07 -06:00
eb68c19472
bump_build_number adds git tag
2019-04-04 13:44:04 -06:00
501e2c761f
Merge tag '2.38.1.2'
2019-04-04 13:42:07 -06:00
a1c6b7ec15
"Bump build to 2.38.1.2."
2019-04-03 17:36:00 -06:00
a693e77c01
sync translations
2019-04-03 17:35:57 -06:00
7522fbd88e
"Bump build to 2.38.1.1."
2019-04-03 12:34:39 -06:00
9bf7e8fb87
Merge branch 'charlesmchen/cleanCKOperationsVsFeatureFlag' into release/2.38.1
2019-04-03 13:11:39 -04:00
dc46974395
Respond to CR.
2019-04-03 13:11:08 -04:00
d189621495
Don't bother cleaning up CKOperations per feature flag.
2019-04-03 13:08:18 -04:00
9c9545b408
update tags to ignore
2019-04-03 11:02:19 -06:00
de61d80e67
Merge branch 'mkirk/rotate-recording-bar' into release/2.38.1
2019-04-03 10:55:38 -06:00
5e96769a12
resize voice note bar with rotation
2019-04-03 10:55:33 -06:00
b8b630b275
Merge branch 'mkirk/fix-faded-recording-bar' into release/2.38.1
2019-04-03 10:55:01 -06:00
63907acb54
Don't update "cancel" status when locked
2019-04-03 10:54:54 -06:00
2e1d805dd5
Merge branch 'mkirk/ios9-hack-restore-input-view' into release/2.38.1
2019-04-03 10:53:18 -06:00
8ead2cc83d
fix overzealous assert
2019-04-03 10:53:08 -06:00
fdc9db3487
iOS9 workaround to restore input view after sending captioned attachment
2019-04-03 10:52:00 -06:00
d06280a270
"Bump build to 2.38.1.0."
2019-04-03 06:28:38 -06:00
58cf7d5eba
Merge branch 'mkirk/fronting' into release/2.38.1
2019-04-03 06:28:04 -06:00
1fae83a777
respect any CDN headers (eg Host for front)
2019-04-02 20:01:04 -06:00
3fb8b02b3b
update front
2019-04-02 19:57:38 -06:00
6fc7354e31
Merge branch 'mkirk/fixup-tests2'
2019-04-01 14:06:12 -06:00
a7bd372147
Fix tests by removing side effect in getter
...
While setting up the test CurrentAppContect, we use OWSTemporaryDirectory which in turn
recursively references CurrentAppContext, which crashes.
Clearing temp directories on every activation is sufficient.
2019-04-01 14:05:58 -06:00
07e88009e4
Merge tag '2.38.0.11'
2019-04-01 14:04:43 -06:00
3b0d6991e1
"Bump build to 2.38.0.11."
2019-04-01 13:59:17 -06:00
1d959792e8
sync translations
2019-04-01 13:59:05 -06:00
e69494450b
put conversation search behind feature flag
2019-04-01 13:56:27 -06:00
e42192624f
fixup tests
2019-03-29 15:43:08 -06:00
6c4dbfbc4c
"Bump build to 2.38.0.10."
2019-03-29 13:35:35 -06:00
70b68f5412
sync translations
2019-03-29 13:35:13 -06:00
1ad30f4425
Merge branch 'mkirk/long-text-notification' into release/2.38.0
2019-03-29 13:31:34 -06:00
2242dd240f
Fix "blank notification text" for oversize messages
2019-03-29 13:31:27 -06:00
85b42865df
Merge branch 'charlesmchen/conversationScrollVsAppeared' into release/2.38.0
2019-03-29 15:30:15 -04:00
8f7ad79506
Only update scroll state to reflect keyboard changes if view has appeared.
2019-03-29 15:29:54 -04:00
61740b89e8
Merge branch 'charlesmchen/typingAnimationsVsBackground' into release/2.38.0
2019-03-29 15:00:04 -04:00
746fd278da
Restart typing indicators animations after app returns from background.
2019-03-29 14:59:46 -04:00
a98bfee645
Merge branch 'mkirk/highlight-pattern' into release/2.38.0
2019-03-29 12:38:44 -06:00
5b77bc5475
sleep hack for iOS9
2019-03-29 12:38:01 -06:00
05d8846f6c
match highlight behavior with search behavior
2019-03-29 12:38:01 -06:00
8caff1a535
Merge branch 'mkirk/ios9-assert' into release/2.38.0
2019-03-29 12:36:56 -06:00
5ed16355d7
iOS9 needs a different assertion
2019-03-29 12:36:33 -06:00
00cc4aa005
Merge branch 'mkirk/timestamp-parsing' into release/2.38.0
2019-03-29 10:33:51 -06:00
048f19c6b8
specify yyyy date format
2019-03-29 10:33:32 -06:00
5e52d66b05
bump feedback endpoint
2019-03-29 10:33:32 -06:00
0d822597a1
specify locale when timestamp parsing
2019-03-29 10:33:32 -06:00
033f5fe2df
Merge branch 'charlesmchen/imageEditorVsFirstResponder2' into release/2.38.0
2019-03-28 18:31:16 -04:00
a3efb58d15
Respond to CR.
2019-03-28 18:29:19 -04:00
517a550593
Further improve "first responder" behavior in the image editor.
2019-03-28 18:06:35 -04:00
d3869af067
Merge branch 'charlesmchen/imageEditorVsFirstResponder' into release/2.38.0
2019-03-28 18:05:57 -04:00
Michael Kirk
Matthew Chen