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-335, GH-1648, GH-1735, GH-1736: Rewards fixes #386

Merged
merged 5 commits into from Jun 10, 2019
Merged

GH-335, GH-1648, GH-1735, GH-1736: Rewards fixes #386

merged 5 commits into from Jun 10, 2019

Conversation

@luciancor
Copy link
Contributor

@luciancor luciancor commented May 27, 2019 •
edited

Some little fixes for Ghostery rewards

  • 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?
luciancor added 4 commits May 24, 2019
@luciancor
GH-335: fix Expire date in German
fa41815
@luciancor
GH-1648: fix Rewards layout issues
b2172a1
@luciancor
GH-1735: align all the text in the reward card to the left
4486cc3
@luciancor
GH-1736: calculate the real expiration date for rewards in the Reward…
Loading status checks…
57175ff 
… box
@luciancor luciancor requested review from trickpattyFH20 and ghostery/ghostery as code owners May 27, 2019
@christophertino
christophertino reviewed Jun 6, 2019
View changes
Copy link
Member

@christophertino christophertino left a comment

@luciancor I'm checking these new German strings against Transifex and it looks like Roberto recently changed them to a different text variation. The Transifex strings are the master and will overwrite these. Can you confirm that his changes are ok?
@jsignanini
Merge branch 'develop' into rewards_fixes
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…
8f34be7
@jsignanini
jsignanini approved these changes Jun 10, 2019
View changes
@jsignanini jsignanini changed the title Rewards fixes GH-335, GH-1648, GH-1735, GH-1736: Rewards fixes Jun 10, 2019
@jsignanini jsignanini merged commit 121f852 into ghostery:develop Jun 10, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@christophertino christophertino added this to the 8.4.0 milestone Jul 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophertino christophertino

@jsignanini jsignanini

@trickpattyFH20 trickpattyFH20

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

Successfully merging this pull request may close these issues.

None yet

3 participants
@luciancor @jsignanini @christophertino