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-1790 - Show ad-block icons in detail view tracker list #411

Merged
merged 3 commits into from Jul 17, 2019
Merged

GH-1790 - Show ad-block icons in detail view tracker list #411

merged 3 commits into from Jul 17, 2019

Conversation

@christophertino
Copy link
Member

@christophertino christophertino commented Jul 8, 2019

Previously we were only looking at getGhosteryStats from anti-tracking and not ad-blocking. We now merge the data from both of those calls under getCliqzGhosteryBugs.

This also improves how we were totaling 'unsafe' trackers found by anti-tracking. @sammacbeth take a look at getCliqzAntiTrackingCount and let me know if that works for adding up the anti-tracking stats.
@christophertino
fix tracker counting to include ad-block data
Loading status checks…
3cea1c7
@christophertino christophertino requested a review from sammacbeth Jul 8, 2019
@christophertino christophertino requested review from zarembsky and ghostery/ghostery as code owners Jul 8, 2019
@sammacbeth
sammacbeth approved these changes Jul 9, 2019
View changes
Copy link
Contributor

@sammacbeth sammacbeth left a comment

Looks good to me!
@zarembsky
zarembsky approved these changes Jul 9, 2019
View changes
@christophertino christophertino added this to the 8.4.1 milestone Jul 11, 2019
@christophertino
update website support links
Loading status checks…
9401944
@christophertino
Merge branch 'develop' into feature/GH-1790
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…
ebf76c1
@christophertino christophertino merged commit 043e302 into develop Jul 17, 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/GH-1790 branch Jul 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sammacbeth sammacbeth

@zarembsky zarembsky

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

Successfully merging this pull request may close these issues.

None yet

3 participants
@christophertino @sammacbeth @zarembsky