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

Supporter panels and partial theme handling #154

Merged
merged 66 commits into from Aug 31, 2018
Merged

Supporter panels and partial theme handling #154

merged 66 commits into from Aug 31, 2018
+1,164 −203

Commits on Jul 17, 2018

  1. Adding Supporter menu item (GH-1253)

    @zarembsky
    zarembsky committed Jul 17, 2018
    7e5a5e7

  2. Implementing conditional enabling/disabling of Supporter menu item.

    @zarembsky
    zarembsky committed Jul 17, 2018
    5a9307b

Commits on Jul 18, 2018

  1. Header badge implemented

    @zarembsky
    zarembsky committed Jul 18, 2018
    e051b0d

  2. Adding Subscription components.

    @zarembsky
    zarembsky committed Jul 18, 2018
    fc686bb

  3. Adding react files to support Subscription view in the panel.

    @zarembsky
    zarembsky committed Jul 18, 2018
    e12966d

Commits on Jul 19, 2018

  1. Adding Golden Badge panel.

    @zarembsky
    zarembsky committed Jul 19, 2018
    4a8bab4

  2. Moving inline styles for subscriber panel to scss.

    @zarembsky
    zarembsky committed Jul 19, 2018
    aa750d0

  3. Merge branch 'develop' into feature/supporter 

    # Conflicts:
#	app/panel/components/HeaderMenu.jsx
#	app/panel/constants/constants.js
#	app/panel/reducers/index.js
#	src/classes/ConfData.js
    @zarembsky
    zarembsky committed Jul 19, 2018
    f1fb5a4

  4. Merge discrepancies

    @zarembsky
    zarembsky committed Jul 19, 2018
    9e556a8

Commits on Jul 20, 2018

  1. Working on Themes

    @zarembsky
    zarembsky committed Jul 20, 2018
    63878dd

  2. Styling

    @zarembsky
    zarembsky committed Jul 20, 2018
    a5c94f5

  3. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Jul 20, 2018
    bff0710

  4. Good state #1.

    @zarembsky
    zarembsky committed Jul 20, 2018
    c837bdc

Commits on Jul 24, 2018

  1. Adding fields to Subscription info

    @zarembsky
    zarembsky committed Jul 24, 2018
    9193671

  2. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Jul 24, 2018
    fba7cb7

Commits on Jul 25, 2018

  1. Continue styling.

    @zarembsky
    zarembsky committed Jul 25, 2018
    3b5b2a4

  2. Adding Subscribe panel.

    @zarembsky
    zarembsky committed Jul 25, 2018
    8497b93

  3. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Jul 25, 2018
    d793e65

  4. Adding support for subscription data in the background.

    @zarembsky
    zarembsky committed Jul 25, 2018
    19e867a

  5. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Jul 25, 2018
    6f1e508

Commits on Jul 26, 2018

  1. Connecting background

    @zarembsky
    zarembsky committed Jul 26, 2018
    6cdbead

  2. Implementing supporter connection.

    @zarembsky
    zarembsky committed Jul 26, 2018
    c3438bc

Commits on Jul 30, 2018

  1. Code cleanup

    @zarembsky
    zarembsky committed Jul 30, 2018
    f2632df

Commits on Jul 31, 2018

  1. Working on Midnight theme

    @zarembsky
    zarembsky committed Jul 31, 2018
    d8c2066

  2. Working on Midnight theme.

    @zarembsky
    zarembsky committed Jul 31, 2018
    f4a7be0

Commits on Aug 1, 2018

  1. Adding persisting of selected theme.

    @zarembsky
    zarembsky committed Aug 1, 2018
    e280db5

  2. Persisting selected theme.

    @zarembsky
    zarembsky committed Aug 1, 2018
    3b338f8

Commits on Aug 6, 2018

  1. Style adjustments.

    @zarembsky
    zarembsky committed Aug 6, 2018
    bfa6e43

Commits on Aug 7, 2018

  1. Lint and simplification.

    @zarembsky
    zarembsky committed Aug 7, 2018
    77a79d7

  2. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Aug 7, 2018
    5f5bcb1

Commits on Aug 13, 2018

  1. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Aug 13, 2018
    2c65044

  2. Adjustments according to changed requirements

    @zarembsky
    zarembsky committed Aug 13, 2018
    7398858

  3. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Aug 13, 2018
    c35fe55

Commits on Aug 14, 2018

  1. More or less stable.

    @zarembsky
    zarembsky committed Aug 14, 2018
    38f699e

Commits on Aug 15, 2018

  1. Multiple fixes.

    @zarembsky
    zarembsky committed Aug 15, 2018
    eab146a

  2. Adding tracker stats

    @zarembsky
    zarembsky committed Aug 15, 2018
    1e3405c

  3. Fix for a bug.

    @zarembsky
    zarembsky committed Aug 15, 2018
    28b8b02

  4. Commiting lint changes

    @zarembsky
    zarembsky committed Aug 15, 2018
    b8d7602

Commits on Aug 16, 2018

  1. Removing inlined svg. Replacing supporter to subscriber.

    @zarembsky
    zarembsky committed Aug 16, 2018
    d4313d6

  2. Adding svg files for menu item and badge

    @zarembsky
    zarembsky committed Aug 16, 2018
    4f3e735

  3. Adding react-svg package.

    @zarembsky
    zarembsky committed Aug 16, 2018
    93eb1e9

  4. Adding manage-subscription.svg

    @zarembsky
    zarembsky committed Aug 16, 2018
    d4f33a5

  5. Adding subscribe-badge.svg

    @zarembsky
    zarembsky committed Aug 16, 2018
    2b37dfd

  6. Merge branch 'develop' into feature/supporter

    @zarembsky
    zarembsky committed Aug 16, 2018
    356344c

Commits on Aug 22, 2018

  1. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 22, 2018
    85c18bf

  2. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 22, 2018
    ec62793

  3. Removing context menu from menu item

    @zarembsky
    zarembsky committed Aug 22, 2018
    9de5889

  4. Improving UI.

    @zarembsky
    zarembsky committed Aug 22, 2018
    78aca6f

  5. Lint fixes.

    @zarembsky
    zarembsky committed Aug 22, 2018
    e3ab906

Commits on Aug 24, 2018

  1. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 24, 2018
    9807cc8

  2. Adding $2

    @zarembsky
    zarembsky committed Aug 24, 2018
    9c9f99f

  3. Merge branch 'feature/supporter' of https://github.com/ghostery/ghost… 

    …ery-extension into feature/supporter
    @zarembsky
    zarembsky committed Aug 24, 2018
    b85cf3e

  4. Changing $gold color

    @zarembsky
    zarembsky committed Aug 24, 2018
    38f4402

  5. Changing highlight color

    @zarembsky
    zarembsky committed Aug 24, 2018
    eb16f19

Commits on Aug 27, 2018

  1. Requested changes.

    @zarembsky
    zarembsky committed Aug 27, 2018
    9cc45be

  2. Additional requested changes

    @zarembsky
    zarembsky committed Aug 27, 2018
    ecbd039

Commits on Aug 28, 2018

  1. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 28, 2018
    97d530c

Commits on Aug 30, 2018

  1. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 30, 2018
    1f1f911

  2. Minor fixes.

    @jsignanini
    jsignanini committed Aug 30, 2018
    b941ae6

  3. Improve setTheme remove logic.

    @jsignanini
    jsignanini committed Aug 30, 2018
    98227db

  4. Fixes for theme.

    @zarembsky
    zarembsky committed Aug 30, 2018
    0405e35

Commits on Aug 31, 2018

  1. Implement NavLink to ensure the correct route is marked as active.

    @jsignanini
    jsignanini committed Aug 31, 2018
    3100863

  2. Replace Link with NavLink.

    @jsignanini
    jsignanini committed Aug 31, 2018
    8bb7958

  3. Minor fixes.

    @jsignanini
    jsignanini committed Aug 31, 2018
    a244867

  4. More minor fixes.

    @jsignanini
    jsignanini committed Aug 31, 2018
    c3c8b62

  5. Merge branch 'develop' into feature/supporter

    @jsignanini
    jsignanini committed Aug 31, 2018
    e352834