Commit Graph

12887 Commits

Author SHA1 Message Date
Michael Kirk
e3345b73ec "Bump build to 2.41.0.19." 2019-07-31 11:11:53 -06:00
Michael Kirk
3bcd86cf03 Revert "prod build"
This reverts commit 77dcf5ffb6.
2019-07-31 11:01:10 -06:00
Michael Kirk
2a9402d7d7 Revert "Revert "Revert "Revert "Merge branch 'nt/ios-13-ssl' into release/2.40.2""""
This reverts commit d2e7b2942e.
2019-07-31 11:01:03 -06:00
Michael Kirk
67dd6bcf5f "Bump build to 2.41.0.18." 2019-07-31 10:55:57 -06:00
Michael Kirk
77dcf5ffb6 prod build 2019-07-31 10:55:48 -06:00
Michael Kirk
d2e7b2942e Revert "Revert "Revert "Merge branch 'nt/ios-13-ssl' into release/2.40.2"""
This reverts commit 9f41bf0989.
2019-07-31 10:54:12 -06:00
Michael Kirk
6bdbe5875b "Bump build to 2.41.0.17." 2019-07-30 18:48:10 -06:00
Michael Kirk
824ca97129 sync translations 2019-07-30 18:47:59 -06:00
Michael Kirk
71532cc321 Merge branch 'charlesmchen/noStickersLayout' into release/2.41.0 2019-07-30 18:44:09 -06:00
Matthew Chen
e9410d9098 Fix broken layout in 'no stickers' case. 2019-07-30 18:44:00 -06:00
Michael Kirk
53cf85b77d "Bump build to 2.41.0.16." 2019-07-26 14:15:21 -06:00
Michael Kirk
bc83ed75ff sync translations 2019-07-26 14:15:11 -06:00
Michael Kirk
58a07ec56e Merge branch 'charlesmchen/disappearingPhotosViewChanges' into release/2.41.0 2019-07-26 14:12:16 -06:00
Matthew Chen
984831d765 Revise disappearing photos view. 2019-07-26 14:11:32 -06:00
Michael Kirk
b7103b9f72 "Bump build to 2.41.0.15." 2019-07-25 15:37:34 -06:00
Michael Kirk
019235159c sync translations 2019-07-25 15:30:57 -06:00
Michael Kirk
4c3cc40ed7 copy update 2019-07-25 15:30:57 -06:00
Matthew Chen
05979ab8e7 Remove analytics stubs. 2019-07-25 10:21:23 -03:00
Matthew Chen
b4f391d8d6 Remove analytics stubs. 2019-07-25 10:19:51 -03:00
Michael Kirk
2a16f53f6f Merge branch 'mkirk/update-notification-copy' into release/2.41.0 2019-07-24 14:21:39 -06:00
Michael Kirk
ca554c4637 update notification copy 2019-07-24 11:22:19 -06:00
Michael Kirk
3a9a2a9b71 "Bump build to 2.41.0.14." 2019-07-23 13:41:05 -06:00
Michael Kirk
b050d82d96 sync translations 2019-07-23 13:40:52 -06:00
Michael Kirk
356435a596 Merge branch 'mkirk/safe-enumeration' into release/2.41.0 2019-07-23 13:37:03 -06:00
Michael Kirk
297a86b812 use safe enumeration 2019-07-23 13:33:40 -06:00
Michael Kirk
de0cde14ec "Bump build to 2.41.0.13." 2019-07-23 10:42:28 -06:00
Michael Kirk
5f3118fc1b toggle flag 2019-07-23 10:42:17 -06:00
Matthew Chen
773fe984c1 Fix icon for 'sending' state of outgoing 'view once photos'. 2019-07-23 10:26:32 -03:00
Michael Kirk
c144627a2c "Bump build to 2.41.0.12." 2019-07-22 14:28:33 -06:00
Michael Kirk
22759c0d49 Merge branch 'nt/sticker-paging-fix' into release/2.41.0 2019-07-22 14:14:52 -06:00
Nora Trapp
4c118f3964 Fix a bug when clicking between sticker packs where the wrong pack would render 2019-07-22 14:09:38 -06:00
Michael Kirk
8a2804cc95 Merge branch 'nt/sticker-receive-fix' into release/2.41.0 2019-07-22 14:09:23 -06:00
Nora Trapp
a104052f2b Fix hasRenderableContent to handle sticker messages 2019-07-22 14:08:42 -06:00
Michael Kirk
c7f98e9dec Merge branch 'charlesmchen/homeViewVsViewOncePhotos' into release/2.41.0 2019-07-22 13:38:49 -06:00
Matthew Chen
72dab08ac5 Fix 'home view doesn't reorder to reflect view-once photos' issue. 2019-07-22 13:38:43 -06:00
Michael Kirk
2dbe3547ee Merge branch 'charlesmchen/imageEditorVsPerMessageExpiration' into release/2.41.0 2019-07-22 13:38:09 -06:00
Matthew Chen
27efb2a1b0 Fix 'image editor vs. per-message expiration' bug. 2019-07-22 13:37:57 -06:00
Michael Kirk
452b46cabd "Bump build to 2.41.0.11." 2019-07-22 12:43:46 -06:00
Michael Kirk
d91f926aaa sync translations 2019-07-22 12:43:39 -06:00
Michael Kirk
74ca0aecb7 update string linter path 2019-07-22 12:41:01 -06:00
Michael Kirk
0215705d4c Merge branch 'mkirk/mediaSendFlowFixes' into release/2.41.0 2019-07-22 12:36:20 -06:00
Michael Kirk
1d6e6fda2c add back camera mode button 2019-07-22 12:35:08 -06:00
Michael Kirk
a8dd11d231 simplify 2019-07-22 12:35:08 -06:00
Michael Kirk
d3e3be90b6 remove isModalState, isAddMoreVisible block instead of copying around state 2019-07-22 12:35:08 -06:00
Matthew Chen
49451c0d67 Simplify the preview text logic for 'view once photos.' 2019-07-22 12:35:08 -06:00
Matthew Chen
66008c54e3 Simplify the preview text logic for 'view once photos.' 2019-07-22 12:35:08 -06:00
Matthew Chen
9bdb85e250 Simplify the preview text logic for 'view once photos.' 2019-07-22 12:35:08 -06:00
Matthew Chen
b0ed14ec19 Update preview text for 'view once photos' again. 2019-07-22 12:35:08 -06:00
Matthew Chen
a95182edc8 Fix modal attachment approval. 2019-07-22 12:35:08 -06:00
Michael Kirk
496b1e1e4b Merge branch 'mkirk/fix-landscape-albums' into release/2.41.0 2019-07-22 11:19:24 -06:00