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

Feature/gh 859 #1

Merged
merged 4 commits into from Mar 9, 2018
Merged

Feature/gh 859 #1

merged 4 commits into from Mar 9, 2018

Conversation

@zarembsky
Copy link
Contributor

@zarembsky zarembsky commented Mar 8, 2018

  • [X ] Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
Serge Zarembsky added 3 commits Mar 8, 2018
Serge Zarembsky
Fix for GH-859
Loading status checks…
262ca37
Serge Zarembsky
Linting.
Loading status checks…
504680e
Serge Zarembsky
Change to be able to run unit tests on Windows.
Loading status checks…
b16336d
@zarembsky zarembsky requested a review from christophertino Mar 8, 2018
@zarembsky zarembsky changed the base branch from master to develop Mar 8, 2018
@christophertino
Merge branch 'develop' into feature/gh-859
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
a22b090
@christophertino christophertino requested a review from ghostery/ghostery as a code owner Mar 8, 2018
@christophertino
christophertino approved these changes Mar 9, 2018
View changes
@christophertino christophertino merged commit 4bcdb53 into develop Mar 9, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@christophertino christophertino deleted the feature/gh-859 branch Mar 9, 2018
zarembsky added a commit that referenced this pull request Jul 20, 2018
@zarembsky
Good state #1.
Loading status checks…
c837bdc
jsignanini added a commit that referenced this pull request Aug 31, 2018
@zarembsky @jsignanini
Supporter panels and partial theme handling (#154)
Loading status checks…
07a8eb5 
* Adding Supporter menu item (GH-1253)

* Implementing conditional enabling/disabling of Supporter menu item.

* Header badge implemented

* Adding Subscription components.

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

* Adding Golden Badge panel.

* Moving inline styles for subscriber panel to scss.

* Merge discrepancies

* Working on Themes

* Styling

* Good state #1.

* Adding fields to Subscription info

* Continue styling.

* Adding Subscribe panel.

* Adding support for subscription data in the background.

* Connecting background

* Implementing supporter connection.

* Code cleanup

* Working on Midnight theme

* Working on Midnight theme.

* Adding persisting of selected theme.

* Persisting selected theme.

* Style adjustments.

* Lint and simplification.

* Adjustments according to changed requirements

* More or less stable.

* Multiple fixes.

* Adding tracker stats

* Fix for a bug.

* Commiting lint changes

* Removing inlined svg. Replacing supporter to subscriber.

* Adding svg files for menu item and badge

* Adding react-svg package.

* Adding manage-subscription.svg

* Adding subscribe-badge.svg

* Removing context menu from menu item

* Improving UI.

* Lint fixes.

* Adding $2

* Changing $gold color

* Changing highlight color

* Requested changes.

* Additional requested changes

* Minor fixes.

* Improve setTheme remove logic.

* Fixes for theme.

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

* Replace Link with NavLink.

* Minor fixes.

* More minor fixes.
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Supporter panels and partial theme handling (#154)
8dfd543 
* Adding Supporter menu item (GH-1253)

* Implementing conditional enabling/disabling of Supporter menu item.

* Header badge implemented

* Adding Subscription components.

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

* Adding Golden Badge panel.

* Moving inline styles for subscriber panel to scss.

* Merge discrepancies

* Working on Themes

* Styling

* Good state #1.

* Adding fields to Subscription info

* Continue styling.

* Adding Subscribe panel.

* Adding support for subscription data in the background.

* Connecting background

* Implementing supporter connection.

* Code cleanup

* Working on Midnight theme

* Working on Midnight theme.

* Adding persisting of selected theme.

* Persisting selected theme.

* Style adjustments.

* Lint and simplification.

* Adjustments according to changed requirements

* More or less stable.

* Multiple fixes.

* Adding tracker stats

* Fix for a bug.

* Commiting lint changes

* Removing inlined svg. Replacing supporter to subscriber.

* Adding svg files for menu item and badge

* Adding react-svg package.

* Adding manage-subscription.svg

* Adding subscribe-badge.svg

* Removing context menu from menu item

* Improving UI.

* Lint fixes.

* Adding $2

* Changing $gold color

* Changing highlight color

* Requested changes.

* Additional requested changes

* Minor fixes.

* Improve setTheme remove logic.

* Fixes for theme.

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

* Replace Link with NavLink.

* Minor fixes.

* More minor fixes.
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Supporter panels and partial theme handling (#154)
04de6d6 
* Adding Supporter menu item (GH-1253)

* Implementing conditional enabling/disabling of Supporter menu item.

* Header badge implemented

* Adding Subscription components.

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

* Adding Golden Badge panel.

* Moving inline styles for subscriber panel to scss.

* Merge discrepancies

* Working on Themes

* Styling

* Good state #1.

* Adding fields to Subscription info

* Continue styling.

* Adding Subscribe panel.

* Adding support for subscription data in the background.

* Connecting background

* Implementing supporter connection.

* Code cleanup

* Working on Midnight theme

* Working on Midnight theme.

* Adding persisting of selected theme.

* Persisting selected theme.

* Style adjustments.

* Lint and simplification.

* Adjustments according to changed requirements

* More or less stable.

* Multiple fixes.

* Adding tracker stats

* Fix for a bug.

* Commiting lint changes

* Removing inlined svg. Replacing supporter to subscriber.

* Adding svg files for menu item and badge

* Adding react-svg package.

* Adding manage-subscription.svg

* Adding subscribe-badge.svg

* Removing context menu from menu item

* Improving UI.

* Lint fixes.

* Adding $2

* Changing $gold color

* Changing highlight color

* Requested changes.

* Additional requested changes

* Minor fixes.

* Improve setTheme remove logic.

* Fixes for theme.

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

* Replace Link with NavLink.

* Minor fixes.

* More minor fixes.
@wlycdgr wlycdgr mentioned this pull request Feb 28, 2019
Closed
5 of 5 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophertino christophertino

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@zarembsky @christophertino