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-1798: Update Unknown category to include Ad Blocker unknowns #433

Merged
merged 10 commits into from Aug 2, 2019
+203 −223
Merged

GH-1798: Update Unknown category to include Ad Blocker unknowns #433

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a0a3ea
Use total trackers displayed for tracker count, rather than all modif…
Eden12345 Jul 31, 2019
8a2289b
Add unknownTrackerCount to adBlock in reducer in case it's needed later
Eden12345 Jul 31, 2019
daff71e
Only count requests modified by tracker, update browser button
Eden12345 Jul 31, 2019
f33b017
Update tests, use better variable names, update duplicate cases in re…
Eden12345 Jul 31, 2019
b5d7668
Combine Ad Blocking unknown trackers with Anti-Tracking into one Unkn…
Eden12345 Aug 1, 2019
6a152b0
Fix UI whitelist update bug and update variable names
Eden12345 Aug 2, 2019
7925769
Fix variable names and remove linter warnings
Eden12345 Aug 2, 2019
0c1d9ad
update DonutGraph to handle adBlock unknown counts
christophertino Aug 2, 2019
ae41fce
remove unused SVG
christophertino Aug 2, 2019
8406660
temporarily remove whitelist buttons from ad-block unknowns
christophertino Aug 2, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

remove unused SVG

  • Loading branch information
@christophertino
christophertino committed Aug 2, 2019
commit ae41fcea7c9c8e1f3f72609f35c91eda3caae40f
6 app/images/panel/group-10-copy.svg
View file
Open in desktop

This file was deleted.

3 src/classes/Policy.js
View file
Open in desktop
@@ -50,8 +50,7 @@ class Policy {
if (this.blacklisted(hostUrl)) {
return globals.BLACKLISTED;
}
if (this.checkSiteWhitelist(hostUrl)
|| this.checkCliqzModuleWhitelist(hostUrl, trackerUrl)) {
if (this.checkSiteWhitelist(hostUrl) || this.checkCliqzModuleWhitelist(hostUrl, trackerUrl)) {
return globals.WHITELISTED;
}
return false;
ProTip! Use n and p to navigate between commits in a pull request.