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

EX-9657: Ghostery custom UI for rewards #521

Merged
merged 5 commits into from Apr 14, 2020
Merged

EX-9657: Ghostery custom UI for rewards #521

merged 5 commits into from Apr 14, 2020

Conversation

@aleksandr-cliqz
Copy link
Contributor

@aleksandr-cliqz aleksandr-cliqz commented Apr 2, 2020 •
edited

https://cliqztix.atlassian.net/browse/EX-9657
@christophertino

WIP: we are waiting for CLIQZ 1.45 build (should be done probably on the next week)

  • 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?
@aleksandr-cliqz aleksandr-cliqz requested a review from ghostery/ghostery as a code owner Apr 2, 2020
@aleksandr-cliqz aleksandr-cliqz changed the title EX-9657: Ghostery custom UI for rewards [WIP] EX-9657: Ghostery custom UI for rewards Apr 2, 2020
@christophertino christophertino changed the base branch from master to develop Apr 9, 2020
@christophertino christophertino added this to the 8.5.0 milestone Apr 9, 2020
@aleksandr-cliqz aleksandr-cliqz changed the title [WIP] EX-9657: Ghostery custom UI for rewards EX-9657: Ghostery custom UI for rewards Apr 14, 2020
Aleksandr Panin added 3 commits Apr 2, 2020
Aleksandr Panin
EX-9657: custom ghostery ui for rewards
eea61b0
Aleksandr Panin
EX-9657: use staging again when DEBUG
f83df71
Aleksandr Panin
EX-9657: browser-core 7.45
Loading status checks…
49d592e
@aleksandr-cliqz aleksandr-cliqz force-pushed the aleksandr-cliqz:EX-9657_ghostery_custom_ui branch from c6c2308 to 49d592e Apr 14, 2020
@aleksandr-cliqz
Copy link
Contributor Author

@aleksandr-cliqz aleksandr-cliqz commented Apr 14, 2020

@christophertino could you take a look plz ?
@christophertino
christophertino approved these changes Apr 14, 2020
View changes
@christophertino
fix merge conflicts
596baf5
@christophertino
Merge branch 'develop' into EX-9657_ghostery_custom_ui
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…
933bfb4
@christophertino christophertino merged commit 71de4e4 into ghostery:develop Apr 14, 2020
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
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
8.5.0
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@aleksandr-cliqz @christophertino