Commit Graph

5867 Commits

Author SHA1 Message Date
Matthew Chen
0ca497846b Elaborate request factory. 2018-03-02 15:05:14 -05:00
Matthew Chen
df9cc1d9a6 Fix Cocoapods. 2018-03-02 13:44:37 -05:00
Matthew Chen
12bd50c3e4 Merge branch 'charlesmchen/2faVsRegistration' 2018-03-02 11:10:31 -05:00
Matthew Chen
a87b79341f Respond to CR. 2018-03-02 11:10:09 -05:00
Matthew Chen
288d049cee Update l10n strings. 2018-03-02 10:55:00 -05:00
Matthew Chen
baf6fcc535 Add 2FA registration view. 2018-03-02 10:55:00 -05:00
Matthew Chen
0dd91ab53b Merge branch 'charlesmchen/redundantSyncSends' 2018-03-02 10:53:56 -05:00
Matthew Chen
b9458fffef Respond to CR. 2018-03-02 10:53:22 -05:00
Matthew Chen
dcf7f550ae Fix redundant sync sends. 2018-03-01 23:37:03 -05:00
Matthew Chen
b07f466e08 Fix redundant sync sends. 2018-03-01 23:34:31 -05:00
Michael Kirk
60259a8a13 Merge branch 'release/2.21.0' 2018-03-01 16:30:37 -05:00
Michael Kirk
dafde88f8b Merge branch 'charlesmchen/explicitExpireTimer' into release/2.21.0 2018-03-01 16:30:03 -05:00
Matthew Chen
6ca55790d5 Cleanup. 2018-03-01 15:55:41 -05:00
Matthew Chen
7437152688 Merge branch 'charlesmchen/2fa' 2018-03-01 15:39:20 -05:00
Matthew Chen
caeb97b466 Respond to CR. 2018-03-01 15:38:59 -05:00
Matthew Chen
a5128273ba Clean up ahead of PR. 2018-03-01 15:38:59 -05:00
Matthew Chen
055061ff5e Clean up ahead of PR. 2018-03-01 15:38:59 -05:00
Matthew Chen
8c54297918 Sketch out 2FA settings views. 2018-03-01 15:38:59 -05:00
Matthew Chen
2ebea29114 Sketch out 2FA settings views. 2018-03-01 15:38:59 -05:00
Matthew Chen
4afedac68c Clean up ahead of PR. 2018-03-01 15:38:59 -05:00
Matthew Chen
ea783a8ad5 Work on two-factor auth settings UI. 2018-03-01 15:38:59 -05:00
Matthew Chen
e12a1e984a Work on two-factor auth settings UI. 2018-03-01 15:38:59 -05:00
Matthew Chen
1f6cbd399e Sketch out 2FA feature. 2018-03-01 15:38:59 -05:00
Matthew Chen
71972ebe2f Be more explicit about expire timer. 2018-03-01 13:41:15 -05:00
Michael Kirk
3f9eb603eb Merge branch 'mkirk/fix-remote-video' 2018-03-01 10:28:55 -05:00
Michael Kirk
f0ca957a09 Fix remote video view
// FREEBIE
2018-03-01 10:28:39 -05:00
Michael Kirk
05d078133b Merge branch 'mkirk/audio-migration-fixups' 2018-03-01 10:28:15 -05:00
Michael Kirk
fa37fdd300 Fix legacy sounds for voip pushes
This way users who were unknowingly upgraded in the night will continue
to hear the ka-klunk until they've seen the splash screen announcing the
feature.

// FREEBIE
2018-03-01 10:28:05 -05:00
Michael Kirk
e5ab6f101b Clean up audio files
- remove unused classic-ringtone
- move classic with the rest of the message sounds

// FREEBIE
2018-03-01 10:28:05 -05:00
Michael Kirk
a068b85734 Audio splashscreen artwork/copy
copy tweaks

// FREEBIE
2018-03-01 10:28:05 -05:00
Michael Kirk
d0bcd8d6c7 Merge tag '2.20.2.2' 2018-03-01 08:52:12 -05:00
Michael Kirk
2038aff9c4 "Bump build to 2.20.2.2." 2018-02-28 20:18:26 -05:00
Michael Kirk
20d759dfeb Merge branch 'mkirk/explicit-timer-stop' into hotfix/2.20.2 2018-02-28 20:10:14 -05:00
Michael Kirk
28c30bbe5c Be explicit when disappearing messages are disabled
// FREEBIE
2018-02-28 20:04:25 -05:00
Michael Kirk
13b5336210 Merge tag '2.20.2.1' 2018-02-28 18:04:51 -05:00
Michael Kirk
e392febb66 "Bump build to 2.20.2.1." 2018-02-28 17:04:29 -05:00
Michael Kirk
be68e0537b bump version
// FREEBIE
2018-02-28 16:40:44 -05:00
Michael Kirk
fd2aaad5ad Merge branch 'mkirk/fix-group-timer-sync' into hotfix/2.20.2 2018-02-28 16:39:39 -05:00
Michael Kirk
b48452a747 Fix group-sync disabling disappearing timer
Must add properties *before* build

// FREEBIE
2018-02-28 16:27:25 -05:00
Matthew Chen
a71e00397f Fix build break related to Swift 4.1 syntax. 2018-02-27 16:19:21 -05:00
Matthew Chen
bf48ccd4ad Merge remote-tracking branch 'origin/hotfix/2.20.1' 2018-02-27 15:45:17 -05:00
Michael Kirk
d534484093 Merge branch 'mkirk/migration-splash' 2018-02-27 15:21:12 -05:00
Michael Kirk
37fdd407d4 CR: Add translation comment
// FREEBIE
2018-02-27 15:19:01 -05:00
Michael Kirk
cf6dfe08bb Custom audio notifications upgrade experience
TODO: update art
2018-02-27 15:14:20 -05:00
Matthew Chen
85eba0cacb "Bump build to 2.20.1.1." 2018-02-27 14:54:35 -05:00
Matthew Chen
c8550055d3 Merge branch 'mkirk/fix-shares' into hotfix/2.20.1 2018-02-27 14:54:26 -05:00
Michael Kirk
12d51d9e22 Fix sharing url when text is also present
This is sort of a stop gap intended to be minimal and safe.

// FREEBIE
2018-02-27 14:54:15 -05:00
Matthew Chen
b1dd325ce8 Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1"
This reverts commit de5d17a396, reversing
changes made to d32e90c3d1.
2018-02-27 14:52:24 -05:00
Matthew Chen
e4ee3e0007 Revert "Respond to CR."
This reverts commit 45201d45ed.
2018-02-27 14:52:21 -05:00
Matthew Chen
45201d45ed Respond to CR. 2018-02-27 11:33:47 -05:00