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
Merged

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

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

Commits on Jun 4, 2019

  1. Add anonymized data points to donut graph

    @Eden12345
    Eden12345 committed Jun 4, 2019
    d17e342

Commits on Jun 5, 2019

  1. Half of original implementation complete

    @Eden12345
    Eden12345 committed Jun 5, 2019
    3ec01dc

Commits on Jun 10, 2019

  1. Copy icons to original branch

    @Eden12345
    Eden12345 committed Jun 10, 2019
    1f80f91

  2. Finish rebuilding feature in original branch with cleaner code

    @Eden12345
    Eden12345 committed Jun 10, 2019
    c2002a5

Commits on Jun 12, 2019

  1. Rendering is working properly for the detailed view list, holding off… 

    … on further commits until Design is finished reviewing the feature (a console.log has been added in each place where logic may be added to match upcoming feature implementation requirements)
    @Eden12345
    Eden12345 committed Jun 12, 2019
    3dcfa15

Commits on Jul 8, 2019

  1. fix tracker counting to include ad-block data

    @christophertino
    christophertino committed Jul 8, 2019
    3cea1c7

Commits on Jul 9, 2019

  1. Merge master into branch to access CliqzFeature component

    @Eden12345
    Eden12345 committed Jul 9, 2019
    c610b08

  2. Get Anti-Tracking button working in category header

    @Eden12345
    Eden12345 committed Jul 9, 2019
    82cb4bb

Commits on Jul 10, 2019

  1. Finish styling header

    @Eden12345
    Eden12345 committed Jul 10, 2019
    d57dc3d

Commits on Jul 11, 2019

  1. Header styling and functionality complete, SVG buttons styled

    @Eden12345
    Eden12345 committed Jul 11, 2019
    df763d6

  2. Resolve merge conflicts with Tino's changes to CliqzModuleData

    @Eden12345
    Eden12345 committed Jul 11, 2019
    0fdb21f

Commits on Jul 17, 2019

  1. Saving (relatively) working code)

    @Eden12345
    Eden12345 committed Jul 17, 2019
    6896ad7

Commits on Jul 18, 2019

  1. Complete core functionality, UI needs to be completed and refactored

    @Eden12345
    Eden12345 committed Jul 18, 2019
    8a88239

  2. Finish styling

    @Eden12345
    Eden12345 committed Jul 18, 2019
    45a97be

Commits on Jul 22, 2019

  1. Resolve merge conflicts with develop

    @Eden12345
    Eden12345 committed Jul 22, 2019
    62d6129

  2. Fix whitelisting UI bug, hide block all button for Unknown category, … 

    …use tracker total for Donut Graph
    @Eden12345
    Eden12345 committed Jul 22, 2019
    fa3bc84

  3. Add expansion functionality, refactory Categories component

    @Eden12345
    Eden12345 committed Jul 22, 2019
    a07526e

  4. Move strings into translation library

    @Eden12345
    Eden12345 committed Jul 22, 2019
    c0995c2

  5. Update Summary reducer tests

    @Eden12345
    Eden12345 committed Jul 22, 2019
    d14fca6

  6. Remove console.log from Summary reducer test

    @Eden12345
    Eden12345 committed Jul 22, 2019
    ccdc375

Commits on Jul 23, 2019

  1. Fix Settings breakage with antiTracking variable short circuit, fix o… 

    …ccasional bug with unwhitelisting
    @Eden12345
    Eden12345 committed Jul 23, 2019
    208d475