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 feature listing #452

Merged
merged 6 commits into from Sep 25, 2019
Merged

GH-1607/Remove feature listing #452

merged 6 commits into from Sep 25, 2019

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Sep 18, 2019

  • 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 feature listing for ghostery rewards on Cliqz browser
@benstrumeyer
Remove feature listing for ghostery rewards on Cliqz browser
Loading status checks…
65df03f
@benstrumeyer benstrumeyer requested a review from wlycdgr Sep 18, 2019
@benstrumeyer benstrumeyer requested a review from Eden12345 as a code owner Sep 18, 2019
@benstrumeyer benstrumeyer removed the request for review from Eden12345 Sep 18, 2019
@fcjr
fcjr reviewed Sep 18, 2019
View changes
app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx Outdated Show resolved Hide resolved
@benstrumeyer
Refactored menu items to a constant
Loading status checks…
62b92e3
@benstrumeyer benstrumeyer requested a review from fcjr Sep 18, 2019
@christophertino christophertino added this to the 8.4.3 milestone Sep 19, 2019
@wlycdgr
Copy link
Member

@wlycdgr wlycdgr commented Sep 20, 2019

Spotted one other reference to Ghostery Rewards that we should remove from the Hub if the user is on Cliqz: in the Home view, in the text under 'Start Browsing!', we say that new users are opted in to Ghostery Rewards by default.
@wlycdgr
wlycdgr reviewed Sep 20, 2019
View changes
app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx Outdated Show resolved Hide resolved
@benstrumeyer
Refactored menuItems. Removed Ghostery Rewards reference in Cliqz bro…
Loading status checks…
b37308e 
…wser Hub
@benstrumeyer benstrumeyer requested a review from ghostery/ghostery as a code owner Sep 20, 2019
@benstrumeyer
Refactored to remove a variable
Loading status checks…
bb92e84
@benstrumeyer
Merge branch 'develop' into feature/remove-feature-listing
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…
2e0e65f
@benstrumeyer benstrumeyer removed the request for review from ghostery/ghostery Sep 20, 2019
@benstrumeyer benstrumeyer self-assigned this Sep 20, 2019
@wlycdgr
wlycdgr reviewed Sep 20, 2019
View changes
_locales/en/messages.json Show resolved Hide resolved
app/hub/Views/HomeView/HomeView.jsx Show resolved Hide resolved
@benstrumeyer
Refactor switch to if/else. Modify language.
Loading status checks…
5113452
@benstrumeyer benstrumeyer requested a review from wlycdgr Sep 20, 2019
@christophertino christophertino requested a review from ghostery/ghostery Sep 25, 2019
@christophertino
christophertino approved these changes Sep 25, 2019
View changes
@christophertino christophertino merged commit 41f5d4d into develop Sep 25, 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
@christophertino christophertino deleted the feature/remove-feature-listing branch Sep 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophertino christophertino

@fcjr fcjr

@wlycdgr wlycdgr

Assignees

@benstrumeyer benstrumeyer

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 @wlycdgr @fcjr @christophertino