Commit Graph

11386 Commits

Author SHA1 Message Date
Michael Kirk 78790ab69d swift style lint 2019-04-04 13:44:42 -06:00
Michael Kirk 9f806d3963 respond to fixed radar (hooray) 2019-04-04 13:44:42 -06:00
Michael Kirk 89ae37cea5 avoid crashing optional unwrapping introduced by Swift5 migration 2019-04-04 13:44:42 -06:00
Michael Kirk cfebb53719 more concise constants post translation 2019-04-04 13:44:42 -06:00
Michael Kirk 57b1aaa3dc inline enum converters 2019-04-04 13:44:42 -06:00
Michael Kirk a837cc0ab0 fix builtInSpeaker type 2019-04-04 13:44:42 -06:00
Michael Kirk 409426d105 work around swift4.2 AudioSession API bug 2019-04-04 13:44:42 -06:00
Michael Kirk d8640f60ef undo most of Category/Mode conversion, respond to new types/api 2019-04-04 13:44:42 -06:00
Michael Kirk 3703b34973 swift5 new compiler nits 2019-04-04 13:44:42 -06:00
Michael Kirk b1e1020eb3 swift5: void promise must take void argument vs no argument 2019-04-04 13:44:42 -06:00
Michael Kirk 30266bf65e autoformatted 2019-04-04 13:44:42 -06:00
Michael Kirk 64a0c4bfaa auto-migrate to Swift5 2019-04-04 13:44:42 -06:00
Michael Kirk 87094a8fb1 update carthage 2019-04-04 13:44:42 -06:00
Michael Kirk b6052045d8 Merge branch 'mkirk/bump-adds-tag' 2019-04-04 13:44:07 -06:00
Michael Kirk eb68c19472 bump_build_number adds git tag 2019-04-04 13:44:04 -06:00
Michael Kirk 501e2c761f Merge tag '2.38.1.2' 2019-04-04 13:42:07 -06:00
Michael Kirk a1c6b7ec15 "Bump build to 2.38.1.2." 2019-04-03 17:36:00 -06:00
Michael Kirk a693e77c01 sync translations 2019-04-03 17:35:57 -06:00
Michael Kirk 7522fbd88e "Bump build to 2.38.1.1." 2019-04-03 12:34:39 -06:00
Matthew Chen 9bf7e8fb87 Merge branch 'charlesmchen/cleanCKOperationsVsFeatureFlag' into release/2.38.1 2019-04-03 13:11:39 -04:00
Matthew Chen dc46974395 Respond to CR. 2019-04-03 13:11:08 -04:00
Matthew Chen d189621495 Don't bother cleaning up CKOperations per feature flag. 2019-04-03 13:08:18 -04:00
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 6fc7354e31 Merge branch 'mkirk/fixup-tests2' 2019-04-01 14:06:12 -06:00
Michael Kirk 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
Michael Kirk 07e88009e4 Merge tag '2.38.0.11' 2019-04-01 14:04:43 -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