Skip to content
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

M20-52: Full takeover of Ghostery rewards #462

Conversation

@aleksandr-cliqz
Copy link
Contributor

@aleksandr-cliqz aleksandr-cliqz commented Oct 24, 2019

https://cliqztix.atlassian.net/browse/M20-52
@luciancor @christophertino @sammacbeth @olpa-cliqz

Description:
the main idea to show myoffrz-rewards instead of ghostery-rewards in ghostery-extension.
Navigation-extension: we treat ghostery as whitelabel extension (see e.g. chip extension)
Ghostery-extension: we reuse in content-script cliqz-bundle (with myoffrz-rewards) and show list of rewards in ghostery-cc; we will use iframe to show list of rewards.

Locales:
There are around 45 keys in the pull-request. Some of them new, some renamed to follow convension (prefix myoffrz_) English: all keys, Poland: around 20 renamed, other countries: will be addressed in next prs

  • 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 review from christophertino, jsignanini, wlycdgr, zarembsky and ghostery/ghostery as code owners Oct 24, 2019
@christophertino christophertino added this to the 8.4.5 milestone Oct 24, 2019
src/background.js Outdated Show resolved Hide resolved
@christophertino
Copy link
Member

@christophertino christophertino commented Nov 5, 2019

Remove unused package:
yarn remove react-shadow-dom-retarget-events

@aleksandr-cliqz
Copy link
Contributor Author

@aleksandr-cliqz aleksandr-cliqz commented Nov 5, 2019

lets keep only en translations

@aleksandr-cliqz aleksandr-cliqz force-pushed the aleksandr-cliqz:M20-52_takeover_of_ghostery_rewards branch from b9a7ec5 to 9d67f42 Nov 11, 2019
Aleksandr Panin added 5 commits Nov 11, 2019
@aleksandr-cliqz
Copy link
Contributor Author

@aleksandr-cliqz aleksandr-cliqz commented Nov 11, 2019

WIP: do not merge it yet plz; checking some stuff

@christophertino
Copy link
Member

@christophertino christophertino commented Nov 14, 2019

@aleksandr-cliqz Looks good to me. Once we get the new browser-core build added we can merge it up.

Aleksandr Panin
@aleksandr-cliqz aleksandr-cliqz force-pushed the aleksandr-cliqz:M20-52_takeover_of_ghostery_rewards branch from d93bd11 to 2a23dbd Nov 18, 2019
Aleksandr Panin added 4 commits Nov 18, 2019
… M20-52_takeover_of_ghostery_rewards
Aleksandr Panin
… M20-52_takeover_of_ghostery_rewards
Aleksandr Panin
@aleksandr-cliqz
Copy link
Contributor Author

@aleksandr-cliqz aleksandr-cliqz commented Nov 19, 2019

@christophertino could you help me plz with continuous-integration/travis-ci/pr ?
in my last commit I added new version of Cliqz package
seems I need somehow to update yarn.lock too

UPD: Chris, thank you

Aleksandr Panin
@christophertino christophertino removed this from the 8.4.5 milestone Nov 19, 2019
@aleksandr-cliqz
Copy link
Contributor Author

@aleksandr-cliqz aleksandr-cliqz commented Nov 20, 2019

@christophertino
Once we get the new browser-core build added we can merge it up.
done :)

… M20-52_takeover_of_ghostery_rewards
@christophertino christophertino added this to the 8.4.6 milestone Nov 22, 2019
@christophertino christophertino merged commit c14d10f into ghostery:develop Nov 22, 2019
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
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants