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-2048: Display premium icons & subscription info & GH-2036: Unlock Plus features on GBE/Midnight for all Premium & Plus users #546

Merged
merged 35 commits into from May 20, 2020
Merged

GH-2048: Display premium icons & subscription info & GH-2036: Unlock Plus features on GBE/Midnight for all Premium & Plus users #546

merged 35 commits into from May 20, 2020
+174 −102

Commits on May 7, 2020

  1. Show premium subscribers a premium badge in simple/detailed views, he… 

    …ader, and settings panel
    @benstrumeyer
    benstrumeyer committed May 7, 2020
    901c4fa

  2. Use api version 2.1.0 to get multiple subscriptions

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    f944c6c

  3. Add hover effect for premium icon in menu

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    e035e69

  4. Use css as single source of truth for icon colors

    @benstrumeyer
    benstrumeyer committed May 7, 2020
    659749b

  5. Handle case where a user has multiple subscriptions and display Premi… 

    …um > Plus
    @benstrumeyer
    benstrumeyer committed May 7, 2020
    2a83d42

Commits on May 8, 2020

  1. Display subscription name

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    de02e6c

  2. Remove duplicate locale string

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    53378f0

  3. Handle case where user only has a premium subscription and clicks the… 

    … subscriber badge icon
    @benstrumeyer
    benstrumeyer committed May 8, 2020
    a10bd6c

  4. Refactor code

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    7e552d2

  5. Merge branch 'develop' into GH-2048

    @benstrumeyer
    benstrumeyer committed May 8, 2020
    eb43832

Commits on May 11, 2020

  1. Refactor subscriber badge css classes, image paths and comments

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    9eb39bd

  2. Fix account#getUserSubscriptionData behavior

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    2d2aa90

  3. Add subscriptionsPremium property to user object to check if a user h… 

    …as a premium subscription
    @benstrumeyer
    benstrumeyer committed May 11, 2020
    9383ab6

  4. Refactor Header component to use subscriptionsPremium property

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    f7b36a9

  5. Add newline

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    f545e7b

  6. Refactor svg template literal

    @benstrumeyer
    benstrumeyer committed May 11, 2020
    2fcc862

Commits on May 12, 2020

  1. Refactor account#getUserSubscriptionData to return an array of subscr… 

    …iptions, and the background handler to return the highest tier subscription
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    ef91547

  2. Pass object that allows destructuring of subscriptionData

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    4fc3f53

  3. Add return statement after callbacks

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    2a9ffcb

  4. Add guard to account#_setSubscriptionData to prevent overriding premi… 

    …um subscription
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    f120d4d

  5. Give user subscriptionsPlus bool if they have either plus or premium … 

    …scope
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    7fe5a24

  6. Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p… 

    …remiumAccess
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    33c506a

  7. Set subscription property on user object with highest tier subscripti… 

    …on in account#getUserSubscriptionData
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    0586ff5

  8. Refactor menu upsell icon to use user.subscriber instead of plusAcces… 

    …s/premiumAccess
    @benstrumeyer
    benstrumeyer committed May 12, 2020
    a77797c

  9. test

    @benstrumeyer
    benstrumeyer committed May 12, 2020
    1816764

Commits on May 13, 2020

  1. Refactor Header logo and menu icon to use subscription instead of pre… 

    …miumAccess and plusAccess
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    0847e49

  2. Rename subscriber variable to subscription

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    d25d313

  3. Refactor subscriber badge to use plusAccess and premiumAccess on clic… 

    …k, and user.subscription for UI
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    c9ad1de

  4. Check if user object exists before accessing subscription property

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    6398be1

  5. Display UI elements basedd off user scope

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    eb337bc

  6. Remove unused subscription property on user

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    3d51fd0

  7. Base menu icon off of plusAccess and premiumAccess

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    23e5eb7

  8. Refactor isPlus to hasPlusAccess, destructure some things, and save s… 

    …ubscriptionData in account#setSubscriptionData
    @benstrumeyer
    benstrumeyer committed May 13, 2020
    49eb749

  9. Use panel#hasPlusAccess() directly

    @benstrumeyer
    benstrumeyer committed May 13, 2020
    47f1cd5

Commits on May 14, 2020

  1. Fix menu icon link

    @benstrumeyer
    benstrumeyer committed May 14, 2020
    ead0930