Commit Graph

12148 Commits

Author SHA1 Message Date
Matthew Chen
f64f78ec24 "Bump build to 2.40.0.11." 2019-05-21 15:57:08 -04:00
Matthew Chen
8f25b6fc07 Merge branch 'charlesmchen/orphanReset' into release/2.40.0 2019-05-21 15:56:47 -04:00
Matthew Chen
65f9eb9005 Respond to CR. 2019-05-21 15:56:13 -04:00
Matthew Chen
03456ecf76 Clean up orphans. 2019-05-21 15:55:28 -04:00
Matthew Chen
b57ebb05d4 Clean up orphans. 2019-05-21 15:55:28 -04:00
Matthew Chen
d9560453b3 Merge branch 'charlesmchen/orphanStickerFiles' into release/2.40.0 2019-05-21 15:54:28 -04:00
Matthew Chen
dc0b1bc223 Cull orphan sticker files. 2019-05-21 15:38:15 -04:00
Matthew Chen
9c72514db1 Merge branch 'charlesmchen/fixExperienceUpgrade' into release/2.40.0 2019-05-21 15:03:04 -04:00
Matthew Chen
a6355aa5d9 Fix experience upgrade. 2019-05-21 10:19:38 -04:00
Matthew Chen
b82d1ce3eb Update l10n strings. 2019-05-21 10:17:28 -04:00
Matthew Chen
1b1e646a25 "Bump build to 2.40.0.10." 2019-05-20 16:15:16 -04:00
Matthew Chen
52344ca156 Merge branch 'charlesmchen/stickerTooltips' into release/2.40.0 2019-05-20 14:27:36 -04:00
Matthew Chen
fa3ab013c9 Respond to CR. 2019-05-20 14:27:19 -04:00
Matthew Chen
3207a33f21 Respond to CR. 2019-05-20 14:22:40 -04:00
Matthew Chen
ac26425133 Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
f447e29528 Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
8f4012c126 Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
720f27074e Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
cbba0f17a0 Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
1d2ac0e2bd Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
8305003bce Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
1df6226c88 Sketch out sticker tooltips. 2019-05-20 14:22:40 -04:00
Matthew Chen
8aa07254fc Merge branch 'charlesmchen/shouldAlwaysPad' into release/2.40.0 2019-05-20 12:36:27 -04:00
Matthew Chen
c662e2f3f4 Rename "shouldAlwaysPad" property. 2019-05-20 12:36:18 -04:00
Matthew Chen
b6e105a0e7 Merge branch 'charlesmchen/incomingStickerFix' into release/2.40.0 2019-05-20 12:35:29 -04:00
Matthew Chen
6f61ad5ccf Fix incoming sticker handling. 2019-05-20 11:21:34 -04:00
Matthew Chen
3a4542e091 Fix incoming sticker handling. 2019-05-20 11:19:31 -04:00
Michael Kirk
85750cc6d2 Merge tag '2.39.1.0' into release/2.40.0 2019-05-17 18:26:56 -06:00
Michael Kirk
24a08ce9c5 "Bump build to 2.39.1.0." 2019-05-17 13:04:24 -06:00
Michael Kirk
e48c009e9e Merge branch 'mkirk/crash-fix' into release/2.39.1 2019-05-17 13:04:09 -06:00
Nora Trapp
dd37c62ecc Merge branch 'nt/add-contact-fix' 2019-05-17 09:59:20 -07:00
Nora Trapp
76aa750e51 Fix an issue where we incorrectly identified a recipient as not in contacts 2019-05-17 09:45:20 -07:00
Michael Kirk
6ac9933019 Protocol stores use strongly typed signatures 2019-05-17 09:45:20 -07:00
Michael Kirk
17da5bb0fe Deprecate untyped protocol store methods
Plumb them through to strongly typed counterparts
2019-05-17 09:45:20 -07:00
Michael Kirk
c284dc3c26 Fix "add more" crash when media library permissions denied 2019-05-16 17:50:12 -06:00
Matthew Chen
3a397bb77a "Bump build to 2.40.0.9." 2019-05-16 17:55:00 -04:00
Matthew Chen
24c8c0e501 Update feature flags for release branch. 2019-05-16 17:54:55 -04:00
Matthew Chen
66c272c54e Merge branch 'charlesmchen/refineStickerFeatureFlags' into release/2.40.0 2019-05-16 17:52:24 -04:00
Matthew Chen
2a8a321c4b Rework sticker feature flags. 2019-05-16 17:48:46 -04:00
Matthew Chen
c121898118 Rework sticker feature flags. 2019-05-16 17:48:46 -04:00
Matthew Chen
e5e9721dc3 Rework sticker feature flags. 2019-05-16 17:48:46 -04:00
Matthew Chen
0830c624bd Merge branch 'charlesmchen/stickersSplash' into release/2.40.0 2019-05-16 17:46:18 -04:00
Matthew Chen
9540818e4b Respond to CR. 2019-05-16 17:46:02 -04:00
Matthew Chen
888febc8dc Sketch out the stickers splash. 2019-05-16 17:32:32 -04:00
Matthew Chen
bc6a99ad21 Sketch out the stickers splash. 2019-05-16 17:32:32 -04:00
Nora Trapp
2f4bf8b13c Merge branch 'nt/call-ended-sound' 2019-05-16 08:05:58 -07:00
Nora Trapp
d31995a4e0 Play a tone when a call is ended. 2019-05-16 07:50:27 -07:00
Matthew Chen
7c6444b628 Revert "Disable GRDB."
This reverts commit 35a6a69399.
2019-05-15 17:53:52 -04:00
Matthew Chen
1de3e6294a Revert "Disable stickerSend feature flag."
This reverts commit 9733fe0104.
2019-05-15 17:53:48 -04:00
Matthew Chen
123a2bab08 "Bump build to 2.40.0.8." 2019-05-15 17:53:42 -04:00