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-1621: Site-Specific Whitelisting for Unknown Trackers via Anti-Tracking #417

Merged
merged 21 commits into from Jul 24, 2019
+815 −216
Merged

GH-1621: Site-Specific Whitelisting for Unknown Trackers via Anti-Tracking #417

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d17e342
Add anonymized data points to donut graph
Eden12345 Jun 4, 2019
3ec01dc
Half of original implementation complete
Eden12345 Jun 5, 2019
1f80f91
Copy icons to original branch
Eden12345 Jun 10, 2019
c2002a5
Finish rebuilding feature in original branch with cleaner code
Eden12345 Jun 10, 2019
3dcfa15
Rendering is working properly for the detailed view list, holding off…
Eden12345 Jun 12, 2019
3cea1c7
fix tracker counting to include ad-block data
christophertino Jul 8, 2019
c610b08
Merge master into branch to access CliqzFeature component
Eden12345 Jul 9, 2019
82cb4bb
Get Anti-Tracking button working in category header
Eden12345 Jul 9, 2019
d57dc3d
Finish styling header
Eden12345 Jul 10, 2019
df763d6
Header styling and functionality complete, SVG buttons styled
Eden12345 Jul 11, 2019
0fdb21f
Resolve merge conflicts with Tino's changes to CliqzModuleData
Eden12345 Jul 11, 2019
6896ad7
Saving (relatively) working code)
Eden12345 Jul 17, 2019
8a88239
Complete core functionality, UI needs to be completed and refactored
Eden12345 Jul 18, 2019
45a97be
Finish styling
Eden12345 Jul 18, 2019
62d6129
Resolve merge conflicts with develop
Eden12345 Jul 22, 2019
fa3bc84
Fix whitelisting UI bug, hide block all button for Unknown category, …
Eden12345 Jul 22, 2019
a07526e
Add expansion functionality, refactory Categories component
Eden12345 Jul 22, 2019
c0995c2
Move strings into translation library
Eden12345 Jul 22, 2019
d14fca6
Update Summary reducer tests
Eden12345 Jul 22, 2019
ccdc375
Remove console.log from Summary reducer test
Eden12345 Jul 22, 2019
208d475
Fix Settings breakage with antiTracking variable short circuit, fix o…
Eden12345 Jul 23, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Copy icons to original branch

  • Loading branch information
@Eden12345
Eden12345 committed Jun 10, 2019
commit 1f80f918eca4fa3ec847b4475e2e71468efc4ba8
3 app/images/panel/anti_track_shield.svg
View file
Open in desktop
@@ -0,0 +1,3 @@
<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
<path d="M10.190881 1.028859c-.114948-.038479-.267884-.038479-.382831 0L1.574491 3.211632C1.229895 3.2881 1 3.594463 1 3.93906c.038479 5.85937 3.178574 11.297185 8.578155 14.935303.114948.076469.268129.114948.42131.114948.153182 0 .306363-.038479.42131-.114948 5.399581-3.638118 8.539676-9.075933 8.578155-14.935303 0-.344597-.229894-.65096-.574491-.727428l-8.233558-2.182773z" stroke="#1DAFED" stroke-width="2" fill="none" fill-rule="evenodd"/>
</svg>
7 app/images/panel/other_data_points.svg
View file
Open in desktop
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="51" height="51">
<g fill="none" fill-rule="evenodd" transform="translate(1 1)">
<circle cx="24.719" cy="24.719" r="24.719" fill="#8459A5" stroke="#86449B"/>
<path fill="#86449B" d="M35.734 14.265C34.891 13.422 33.875 13 32.688 13H18.312c-1.187 0-2.203.422-3.047 1.265-.843.844-1.265 1.86-1.265 3.047v14.375c0 1.188.422 2.204 1.265 3.048.844.843 1.86 1.265 3.047 1.265h14.375c1.188 0 2.204-.422 3.047-1.265.844-.844 1.266-1.86 1.266-3.048V17.312c0-1.187-.422-2.203-1.266-3.047zm-12.21 12.481a3.06 3.06 0 0 1-2.247.929 3.06 3.06 0 0 1-2.246-.929 3.06 3.06 0 0 1-.928-2.246c0-.879.31-1.627.928-2.246a3.06 3.06 0 0 1 2.246-.929c.879 0 1.627.31 2.246.929a3.06 3.06 0 0 1 .929 2.246 3.06 3.06 0 0 1-.929 2.246zm8.444 0a3.059 3.059 0 0 1-2.246.929 3.06 3.06 0 0 1-2.246-.929 3.06 3.06 0 0 1-.928-2.246c0-.879.31-1.627.928-2.246a3.06 3.06 0 0 1 2.246-.929c.879 0 1.628.31 2.246.929a3.06 3.06 0 0 1 .93 2.246 3.06 3.06 0 0 1-.93 2.246z"/>
<path fill="#F5A623" d="M34.734 13.265C33.891 12.422 32.875 12 31.688 12H17.312c-1.187 0-2.203.422-3.047 1.265-.843.844-1.265 1.86-1.265 3.047v14.375c0 1.188.422 2.204 1.265 3.048.844.843 1.86 1.265 3.047 1.265h14.375c1.188 0 2.204-.422 3.047-1.265.844-.844 1.266-1.86 1.266-3.048V16.312c0-1.187-.422-2.203-1.266-3.047zm-12.21 12.481a3.06 3.06 0 0 1-2.247.929 3.06 3.06 0 0 1-2.246-.929 3.06 3.06 0 0 1-.928-2.246c0-.879.31-1.627.928-2.246a3.06 3.06 0 0 1 2.246-.929c.879 0 1.627.31 2.246.929a3.06 3.06 0 0 1 .929 2.246 3.06 3.06 0 0 1-.929 2.246zm8.444 0a3.059 3.059 0 0 1-2.246.929 3.06 3.06 0 0 1-2.246-.929 3.06 3.06 0 0 1-.928-2.246c0-.879.31-1.627.928-2.246a3.06 3.06 0 0 1 2.246-.929c.879 0 1.628.31 2.246.929a3.06 3.06 0 0 1 .93 2.246 3.06 3.06 0 0 1-.93 2.246z"/>
</g>
</svg>
ProTip! Use n and p to navigate between commits in a pull request.