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

updated copy #85

Merged
merged 3 commits into from May 31, 2018
Merged

updated copy #85

merged 3 commits into from May 31, 2018

Conversation

@trickpattyFH20
Copy link
Contributor

@trickpattyFH20 trickpattyFH20 commented May 30, 2018 •
edited

  • change copy for rewards content scripts
  • change style for new copy
  • fix expirationMs conversion
@trickpattyFH20
updated copy
Loading status checks…
3729e1d
@trickpattyFH20 trickpattyFH20 requested a review from ghostery/ghostery as a code owner May 30, 2018
@trickpattyFH20 trickpattyFH20 requested a review from jsignanini May 30, 2018
@trickpattyFH20
Copy link
Contributor Author

@trickpattyFH20 trickpattyFH20 commented May 30, 2018 •
edited

@IAmThePan looks like converting ms -> s in the expirationMs date conversion gives us the correct value, does this look ok to you? (we used to be getting 2000 days when it should have been 2 days)
@trickpattyFH20 trickpattyFH20 requested a review from IAmThePan May 30, 2018
@trickpattyFH20
- copy changes for content script
Loading status checks…
129779e 
- fix expirationMs conversion
- styles for copy change

no parens
@trickpattyFH20 trickpattyFH20 force-pushed the trickpattyFH20:feature/rewards-integration branch from d49fb0c to 129779e May 30, 2018
@IAmThePan
IAmThePan approved these changes May 31, 2018
View changes
Copy link
Contributor

@IAmThePan IAmThePan left a comment

Looks good. Thanks for fixing the ms to s.
@christophertino
Merge branch 'develop' into feature/rewards-integration
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…
8e786ec
@christophertino christophertino merged commit 2ec9e7e into ghostery:develop May 31, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@trickpattyFH20 trickpattyFH20 deleted the trickpattyFH20:feature/rewards-integration branch Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IAmThePan IAmThePan

@jsignanini jsignanini

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

Successfully merging this pull request may close these issues.

None yet

3 participants
@trickpattyFH20 @IAmThePan @christophertino