Commit graph

6045 commits

Author SHA1 Message Date
Matthew Chen
fa07b77ad9 Update cocoapods. 2018-03-02 17:48:24 -05:00
Matthew Chen
864f1cc8ee Clean up ahead of PR. 2018-03-02 17:44:14 -05:00
Matthew Chen
4834a85fb5 Add share option for debug logs. 2018-03-02 17:44:14 -05:00
Matthew Chen
256a300297 Integrate with logs service. 2018-03-02 17:44:14 -05:00
Matthew Chen
7b84afaaf1 Integrate with logs service. 2018-03-02 17:44:14 -05:00
Matthew Chen
4bbf0d9e3d Integrate with logs service. 2018-03-02 17:44:14 -05:00
Matthew Chen
06d16bdec5 Revert "Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1""
This reverts commit b1dd325ce8.
2018-03-02 17:44:14 -05:00
Matthew Chen
aaed4b6a8b Merge branch 'charlesmchen/profileAvatarDownloads' into release/2.21.0 2018-03-02 17:35:11 -05:00
Matthew Chen
e89a0f815b Respond to CR. 2018-03-02 17:34:03 -05:00
Matthew Chen
5e02032fc3 Fix profile avatar downloads. 2018-03-02 17:34:03 -05:00
Matthew Chen
69c49d4a7b Fix profile avatar downloads. 2018-03-02 17:34:03 -05:00
Matthew Chen
b62a43217f Fix profile avatar downloads. 2018-03-02 17:34:03 -05:00
Matthew Chen
15921fa0b5 Fix profile avatar downloads. 2018-03-02 17:34:03 -05:00
Matthew Chen
dfa082238e Fix profile avatar downloads. 2018-03-02 17:34:03 -05:00
Michael Kirk
7f51ada7d9 Merge branch 'mkirk/fix-sound-migration' into release/2.21.0 2018-03-02 17:21:40 -05:00
Michael Kirk
1d7e2e367e Fix migration to work with fallback notifications as well
// FREEBIE
2018-03-02 17:02:15 -05:00
Michael Kirk
716db9f4c4 Merge branch 'mkirk/more-prominent-default' into release/2.21.0 2018-03-02 17:01:42 -05:00
Matthew Chen
b023e77d0e Merge branch 'charlesmchen/requestFactory' 2018-03-02 16:59:59 -05:00
Michael Kirk
46d944740b Make default audio tone more prominent
Label Note as (default)
Move it to the second item in the list, just after "None"

// FREEBIE
2018-03-02 16:32:15 -05:00
Matthew Chen
7fa7f95066 Cleanup ahead of PR. 2018-03-02 16:17:49 -05:00
Matthew Chen
bdee76c8c2 Update cocoapods. 2018-03-02 15:12:32 -05:00
Matthew Chen
3e6db43b24 Clean up ahead of PR. 2018-03-02 15:05:14 -05:00
Matthew Chen
2395dbf66b Fix redundant sync sends. 2018-03-02 15:05:14 -05:00
Matthew Chen
59c745756a Clean up codebase. 2018-03-02 15:05:14 -05:00
Matthew Chen
c2f092018c Elaborate request factory. 2018-03-02 15:05:14 -05:00
Matthew Chen
3acdd84398 Elaborate request factory. 2018-03-02 15:05:14 -05:00
Matthew Chen
004479a2ce Elaborate request factory. 2018-03-02 15:05:14 -05:00
Matthew Chen
c17a819366 Elaborate request factory. 2018-03-02 15:05:14 -05:00
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