Commit graph

2571 commits

Author SHA1 Message Date
Matthew Chen 6fd717fe11 Merge branch 'charlesmchen/scrollToButtonGlitch' 2017-07-04 11:15:30 -04:00
Matthew Chen 07c8eb54b7 Prevent "scroll to button" button from blipping.
// FREEBIE
2017-07-04 11:15:21 -04:00
Matthew Chen 2d8ad30efa Bump version to 2.13.2.0.
// FREEBIE
2017-07-04 09:18:54 -04:00
Matthew Chen 3e87d41715 Update l10n strings.
// FREEBIE
2017-07-04 09:18:07 -04:00
Matthew Chen 6e31713c8d Merge branch 'mkirk/show-timestamp-after-unread' 2017-07-04 09:15:53 -04:00
Michael Kirk c6cd0bbcae Always show timestamp after unread indicator
// FREEBIE
2017-07-04 09:15:46 -04:00
Michael Kirk bef3a56e50 DebugUI: create fake unread messages
helpful for printing unread indicator

// FREEBIE
2017-07-04 09:15:46 -04:00
Matthew Chen 7ffb0d98ec Merge branch 'mkirk/log-when-stating-token-sync' 2017-07-04 09:12:10 -04:00
Michael Kirk 964e558139 log when starting token sync in prod
// FREEBIE
2017-07-03 16:05:04 -05:00
Michael Kirk 6719008ed9 bump version
// FREEBIE
2017-06-30 10:26:04 -10:00
Michael Kirk 2fc2c74fb6 Merge branch 'mkirk/fix-unread-badge' 2017-06-30 10:25:20 -10:00
Michael Kirk dbad3b4f8d [SSK] MessagesManager observes for badge count
// FREEBIE
2017-06-30 10:25:00 -10:00
Michael Kirk d0d4e67615 update badge count when app is in background
// FREEBIE
2017-06-30 09:39:26 -10:00
Michael Kirk 544dec1af8 [SSK] Fix typo in assert
// FREEBIE
2017-06-30 06:18:33 -10:00
Michael Kirk 46bf05182a [SSK][SPK] fix upstream tests
No changes that should affect running client.

// FREEBIE
2017-06-28 18:48:44 -10:00
Matthew Chen 226b7354de Bump build from to 2.13.0.16.
// FREEBIE
2017-06-23 15:29:48 -04:00
Matthew Chen 132348c440 Update l10n strings.
// FREEBIE
2017-06-23 15:29:29 -04:00
Matthew Chen 1e8c24cba3 Bump build from to 2.13.0.15.
// FREEBIE
2017-06-23 15:27:49 -04:00
Michael Kirk ab40bc7242 [SSK] sync key version
// FREEBIE
2017-06-23 15:23:32 -04:00
Matthew Chen 1aacf35956 Merge branch 'charlesmchen/dontReplyToNoLongerVerified' 2017-06-23 14:56:39 -04:00
Matthew Chen e48d51d084 Respond to CR.
// FREEBIE
2017-06-23 14:18:17 -04:00
Matthew Chen a462cba452 Don’t reply to “no longer verified”.
// FREEBIE
2017-06-23 13:55:21 -04:00
Matthew Chen af67f33e3d Merge branch 'charlesmchen/moreFakeContacts' 2017-06-23 09:37:27 -04:00
Matthew Chen db3407853a Refine fake contact creation.
// FREEBIE
2017-06-23 09:37:22 -04:00
Matthew Chen 10fb3286ce Merge branch 'charlesmchen/removePhoneNumberLengthLimit' 2017-06-23 09:36:28 -04:00
Matthew Chen 791c5bb89e Revise phone number length limit in registration view.
// FREEBIE
2017-06-23 09:34:02 -04:00
Matthew Chen 351c8c00f0 Remove phone number length limit in registration view.
// FREEBIE
2017-06-23 09:29:58 -04:00
Matthew Chen 96f833473c Merge branch 'charlesmchen/bumpBuildNumberScript' 2017-06-23 09:23:25 -04:00
Matthew Chen 0486cfe7e3 Add script to bump build numbers.
// FREEBIE
2017-06-23 09:23:18 -04:00
Matthew Chen 4133673d70 Bump build number to 2.13.0.14.
// FREEBIE
2017-06-22 18:22:11 -04:00
Matthew Chen 1eff5513b3 [SSK] Archive sessions upon identity change.
// FREEBIE
2017-06-22 18:21:42 -04:00
Matthew Chen 67d60ff01b Bump build number to 2.13.0.13.
// FREEBIE
2017-06-22 17:27:38 -04:00
Michael Kirk 4cbba496ef Merge branch 'mkirk/archive-sibling-state' 2017-06-22 17:26:15 -04:00
Michael Kirk 3e43eef534 [SSK][SPK] Archive all recipient's sessions on identity change.
// FREEBIE
2017-06-22 17:25:32 -04:00
Matthew Chen ad17c444f7 [SSK] Add creation timestamp to attachment streams.
// FREEBIE
2017-06-22 17:18:01 -04:00
Matthew Chen ff89cbabcc Bump build number to 2.13.0.12.
// FREEBIE
2017-06-22 15:40:36 -04:00
Matthew Chen 84d8fb0853 Update l10n strings.
// FREEBIE
2017-06-22 15:40:15 -04:00
Michael Kirk 55bc6868f9 Merge branch 'mkirk/verification-sync' 2017-06-22 15:24:07 -04:00
Michael Kirk 140625b2a0 [SSK] verification sync
// FREEBIE
2017-06-22 15:23:52 -04:00
Michael Kirk a933fbf215 sync verifications with contact syncing
// FREEBIE
2017-06-22 15:21:25 -04:00
Michael Kirk 37b7bf18e9 clarify code and clean up code formatting
I think we hit some pathological cases in clang format, but this is
clearer anyway IMO

// FREEBIE
2017-06-22 15:20:34 -04:00
Matthew Chen b7307ecfa0 Merge branch 'charlesmchen/crashManualCircumvention' 2017-06-22 15:10:24 -04:00
Matthew Chen e814ae129d Fix crash in manual censorship circumvention logic on iOS 9.
// FREEBIE
2017-06-22 15:10:14 -04:00
Matthew Chen d00928902f Merge branch 'charlesmchen/moreScrollDownButton' 2017-06-22 15:08:48 -04:00
Matthew Chen f7c81bae9d Show the “scroll down” button if user scrolls up, even if there are no unread messages.
// FREEBIE
2017-06-22 15:08:35 -04:00
Matthew Chen 89c252a420 Merge branch 'charlesmchen/logOverflow' 2017-06-22 14:30:11 -04:00
Matthew Chen e6aacf0bca [SSK] Reduce chattiness of logs; increase log file sizes.
// FREEBIE
2017-06-22 14:29:32 -04:00
Matthew Chen eff1974eeb [SSK] Reduce chattiness of logs; increase log file sizes.
// FREEBIE
2017-06-22 10:10:56 -04:00
Matthew Chen 1ae7f07104 Merge branch 'charlesmchen/keychainVsRegistrationDebug' 2017-06-22 09:37:39 -04:00
Matthew Chen 15ecb03471 Respond to CR.
// FREEBIE
2017-06-22 09:37:30 -04:00