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-1607: Remove Ghostery rewards toggle, and add language for Cliqz Browser #450

Merged
merged 2 commits into from Sep 17, 2019
Merged

GH-1607: Remove Ghostery rewards toggle, and add language for Cliqz Browser #450

merged 2 commits into from Sep 17, 2019

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Sep 16, 2019 •
edited

  • 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?
  • Remove Ghostery Rewards feature listing and toggle on Cliqz Browser
  • Turn off, gray out, and make non-interactive the Anti-Tracking and Ad Blocking feature listings & toggles
  • Replace the descriptive text beneath Anti-Tracking and Ad Blocking with "This feature is already active in Cliqz by default. Learn more."
@benstrumeyer benstrumeyer requested a review from wlycdgr Sep 16, 2019
@benstrumeyer benstrumeyer requested review from Eden12345 and ghostery/ghostery as code owners Sep 16, 2019
@benstrumeyer benstrumeyer removed request for ghostery/ghostery and Eden12345 Sep 16, 2019
@benstrumeyer
Remove ghostery rewards toggle and add language for Cliqz Browser
Loading status checks…
363cb0a
@benstrumeyer benstrumeyer force-pushed the feature/modify-intro-hub branch from 14c3fa5 to 363cb0a Sep 17, 2019
@benstrumeyer benstrumeyer changed the title Removed Ghostery rewards toggle, and added language for Cliqz Browser Remove Ghostery rewards toggle, and add language for Cliqz Browser Sep 17, 2019
@wlycdgr
wlycdgr approved these changes Sep 17, 2019
View changes
Copy link
Member

@wlycdgr wlycdgr left a comment

I think we got what we needed when we reviewed the branch. Looks good!
@wlycdgr wlycdgr requested a review from christophertino Sep 17, 2019
@jsignanini jsignanini changed the title Remove Ghostery rewards toggle, and add language for Cliqz Browser GH-1607: Remove Ghostery rewards toggle, and add language for Cliqz Browser Sep 17, 2019
@jsignanini
jsignanini reviewed Sep 17, 2019
View changes
app/shared-components/ToggleSwitch/ToggleSwitch.jsx Outdated Show resolved Hide resolved
@jsignanini
jsignanini reviewed Sep 17, 2019
View changes
app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx Outdated Show resolved Hide resolved
@jsignanini
jsignanini requested changes Sep 17, 2019
View changes
Copy link
Member

@jsignanini jsignanini left a comment

Added minor comments, please review.
@jsignanini jsignanini removed the request for review from christophertino Sep 17, 2019
@benstrumeyer
Move default props to bottom of file. Remove variable name for clarit…
Loading status checks…
caba482 
…y. Remove unused scss and props
@benstrumeyer benstrumeyer requested a review from jsignanini Sep 17, 2019
@jsignanini
jsignanini approved these changes Sep 17, 2019
View changes
@jsignanini jsignanini merged commit 6945ecf into develop Sep 17, 2019
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
@jsignanini jsignanini deleted the feature/modify-intro-hub branch Sep 17, 2019
@christophertino christophertino added this to the 8.4.3 milestone Sep 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsignanini jsignanini

@wlycdgr wlycdgr

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

Successfully merging this pull request may close these issues.

None yet

4 participants
@benstrumeyer @jsignanini @wlycdgr @christophertino