Commit Graph

5878 Commits (72428350c218728bad948afc828b2ebfda080ab3)
 

Author SHA1 Message Date
Michael Kirk 72428350c2 Audit for missing reverse integration upon committing to master
This is meant as a nag. I'm not sure there'd be a good way to
catch-us-in-the-act unless we migrate to some merge tools a la git-flow.

// FREEBIE
7 years ago
Matthew Chen b023e77d0e Merge branch 'charlesmchen/requestFactory' 7 years ago
Matthew Chen 7fa7f95066 Cleanup ahead of PR. 7 years ago
Matthew Chen bdee76c8c2 Update cocoapods. 7 years ago
Matthew Chen 3e6db43b24 Clean up ahead of PR. 7 years ago
Matthew Chen 2395dbf66b Fix redundant sync sends. 7 years ago
Matthew Chen 59c745756a Clean up codebase. 7 years ago
Matthew Chen c2f092018c Elaborate request factory. 7 years ago
Matthew Chen 3acdd84398 Elaborate request factory. 7 years ago
Matthew Chen 004479a2ce Elaborate request factory. 7 years ago
Matthew Chen c17a819366 Elaborate request factory. 7 years ago
Matthew Chen 0ca497846b Elaborate request factory. 7 years ago
Matthew Chen df9cc1d9a6 Fix Cocoapods. 7 years ago
Matthew Chen 12bd50c3e4 Merge branch 'charlesmchen/2faVsRegistration' 7 years ago
Matthew Chen a87b79341f Respond to CR. 7 years ago
Matthew Chen 288d049cee Update l10n strings. 7 years ago
Matthew Chen baf6fcc535 Add 2FA registration view. 7 years ago
Matthew Chen 0dd91ab53b Merge branch 'charlesmchen/redundantSyncSends' 7 years ago
Matthew Chen b9458fffef Respond to CR. 7 years ago
Matthew Chen dcf7f550ae Fix redundant sync sends. 7 years ago
Matthew Chen b07f466e08 Fix redundant sync sends. 7 years ago
Michael Kirk 60259a8a13 Merge branch 'release/2.21.0' 7 years ago
Michael Kirk dafde88f8b Merge branch 'charlesmchen/explicitExpireTimer' into release/2.21.0 7 years ago
Matthew Chen 6ca55790d5 Cleanup. 7 years ago
Matthew Chen 7437152688 Merge branch 'charlesmchen/2fa' 7 years ago
Matthew Chen caeb97b466 Respond to CR. 7 years ago
Matthew Chen a5128273ba Clean up ahead of PR. 7 years ago
Matthew Chen 055061ff5e Clean up ahead of PR. 7 years ago
Matthew Chen 8c54297918 Sketch out 2FA settings views. 7 years ago
Matthew Chen 2ebea29114 Sketch out 2FA settings views. 7 years ago
Matthew Chen 4afedac68c Clean up ahead of PR. 7 years ago
Matthew Chen ea783a8ad5 Work on two-factor auth settings UI. 7 years ago
Matthew Chen e12a1e984a Work on two-factor auth settings UI. 7 years ago
Matthew Chen 1f6cbd399e Sketch out 2FA feature. 7 years ago
Matthew Chen 71972ebe2f Be more explicit about expire timer. 7 years ago
Michael Kirk 3f9eb603eb Merge branch 'mkirk/fix-remote-video' 7 years ago
Michael Kirk f0ca957a09 Fix remote video view
// FREEBIE
7 years ago
Michael Kirk 05d078133b Merge branch 'mkirk/audio-migration-fixups' 7 years ago
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
7 years ago
Michael Kirk e5ab6f101b Clean up audio files
- remove unused classic-ringtone
- move classic with the rest of the message sounds

// FREEBIE
7 years ago
Michael Kirk a068b85734 Audio splashscreen artwork/copy
copy tweaks

// FREEBIE
7 years ago
Michael Kirk d0bcd8d6c7 Merge tag '2.20.2.2' 7 years ago
Michael Kirk 2038aff9c4 "Bump build to 2.20.2.2." 7 years ago
Michael Kirk 20d759dfeb Merge branch 'mkirk/explicit-timer-stop' into hotfix/2.20.2 7 years ago
Michael Kirk 28c30bbe5c Be explicit when disappearing messages are disabled
// FREEBIE
7 years ago
Michael Kirk 13b5336210 Merge tag '2.20.2.1' 7 years ago
Michael Kirk e392febb66 "Bump build to 2.20.2.1." 7 years ago
Michael Kirk be68e0537b bump version
// FREEBIE
7 years ago
Michael Kirk fd2aaad5ad Merge branch 'mkirk/fix-group-timer-sync' into hotfix/2.20.2 7 years ago
Michael Kirk b48452a747 Fix group-sync disabling disappearing timer
Must add properties *before* build

// FREEBIE
7 years ago