Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-1895 and GH-1896: Midnight promos #485

Merged
merged 12 commits into from Dec 12, 2019
+510 −696
Merged

GH-1895 and GH-1896: Midnight promos #485

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
985bef6
Modifying the Plus promo components to Premium
wlycdgr Dec 10, 2019
3106a30
Continue modifying front end promo code from the old Plus promos to t…
wlycdgr Dec 10, 2019
e6c0166
Premium modal logic working. Now for the copy and images.
wlycdgr Dec 11, 2019
7cf17c2
Implementing Premium promo design and copy. WIP.
wlycdgr Dec 11, 2019
f52574e
Add X icon to panel version of Premium promo modal
wlycdgr Dec 11, 2019
0eacbff
Premium promo designs complete
wlycdgr Dec 11, 2019
38e319c
Remove PlusUpgradePromoModal component
wlycdgr Dec 11, 2019
7483ca2
Cleanup PremiumPromoModal component. Add locale strings.
wlycdgr Dec 11, 2019
f9cdd94
Remove console logs from Panel
wlycdgr Dec 12, 2019
5377733
Do not show Premium promo to Premium subscribers
wlycdgr Dec 12, 2019
1fe414b
Remove debug log from manifest
wlycdgr Dec 12, 2019
03edb8c
Merge branch 'develop' into midnight-promos
jsignanini Dec 12, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…

Merge branch 'develop' into midnight-promos

  • Loading branch information
@jsignanini
jsignanini committed Dec 12, 2019
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
commit 03edb8c35091fb9c10a576f55b78e3df3c5b4fe8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.

ProTip! Use n and p to navigate between commits in a pull request.