Commit Graph

12865 Commits

Author SHA1 Message Date
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
Michael Kirk
5fd43b4880 fix album layout in landscape 2019-07-22 11:18:01 -06:00
Michael Kirk
50db385fee Merge branch 'nt/view-once-pan-crash' into release/2.41.0 2019-07-22 10:26:48 -06:00
Nora Trapp
5038a0735b Don't crash when panning on view once message 2019-07-20 09:11:27 -07:00
Matthew Chen
fd6e443e37 Merge branch 'charlesmchen/disableStickerSend' into release/2.41.0 2019-07-19 14:21:58 -03:00
Matthew Chen
1fd004d0d0 Make 'sticker send' feature flag 'debug only'. 2019-07-19 14:21:11 -03:00
Matthew Chen
a0f029a53b Disable 'sticker send' feature flag. 2019-07-19 11:16:53 -03:00
Michael Kirk
68d64cec5c update pods 2019-07-18 15:54:13 -06:00
Michael Kirk
5b49457570 "Bump build to 2.41.0.10." 2019-07-16 16:08:09 -06:00
Michael Kirk
70c6bc3cd6 sync translations 2019-07-16 16:08:00 -06:00
Michael Kirk
6b3a6bb3a0 Merge branch 'charlesmchen/reducePerMessageExpirationDuration' into release/2.41.0 2019-07-16 16:02:15 -06:00
Matthew Chen
70f9365c32 Reduce duration of per-message expiration. 2019-07-16 16:02:02 -06:00
Michael Kirk
783b48c6c2 Merge branch 'mkirk/smk-cert' into release/2.41.0 2019-07-16 15:59:40 -06:00
Michael Kirk
9f046c5a82 adapt to lossless certs 2019-07-16 15:57:54 -06:00
Michael Kirk
e6931cbaf9 "Bump build to 2.41.0.9." 2019-07-15 14:21:15 -06:00
Michael Kirk
7a38f0791d Merge branch 'mkirk/ios9-reminder' into release/2.41.0 2019-07-15 13:57:41 -06:00
Michael Kirk
11dcdfd618 more frequest iOS9 reminders 2019-07-15 13:57:23 -06:00
Michael Kirk
2677fc1b12 Merge tag '2.40.4.2' into release/2.41.0 2019-07-15 13:54:32 -06:00
Michael Kirk
9cd05d7826 "Bump build to 2.40.4.2." 2019-07-14 08:32:10 -06:00
Michael Kirk
49f0af2add Merge tag '2.40.3.2' into release/2.40.4 2019-07-14 08:31:51 -06:00
Michael Kirk
1adfbfdacb "Bump build to 2.40.3.2." 2019-07-14 08:29:55 -06:00
Michael Kirk
fb99d24cd5 Merge branch 'mkirk/fix-typo' into release/2.40.3 2019-07-14 08:29:16 -06:00
Michael Kirk
ffa8fad69d Consistent capitalization 2019-07-12 09:06:00 -06:00