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

Fixes for metrics bugs GH-1001 and GH-1022 #46

Closed
wants to merge 128 commits into from
Closed

Fixes for metrics bugs GH-1001 and GH-1022 #46

wants to merge 128 commits into from
+11,784 −7,042

Commits on Mar 8, 2018

  1. Fix for GH-859

    Serge Zarembsky committed Mar 8, 2018
    262ca37

  2. Linting.

    Serge Zarembsky committed Mar 8, 2018
    504680e

  3. Change to be able to run unit tests on Windows.

    Serge Zarembsky committed Mar 8, 2018
    b16336d

  4. add CODEOWNERS file

    @christophertino
    christophertino committed Mar 8, 2018
    181ebd8

  5. Merge branch 'develop' into feature/gh-859

    @christophertino
    christophertino committed Mar 8, 2018
    a22b090

Commits on Mar 9, 2018

  1. Merge pull request #1 from ghostery/feature/gh-859 

    Feature/gh 859
    @christophertino
    christophertino committed Mar 9, 2018
    4bcdb53

Commits on Mar 12, 2018

  1. Fixes for GH-869, GH-870.

    Serge Zarembsky committed Mar 12, 2018
    8318f2c

  2. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 12, 2018
    c3fb116

Commits on Mar 13, 2018

  1. Fix for GH-872

    Serge Zarembsky committed Mar 13, 2018
    eb3baea

  2. Fixing lint errors.

    Serge Zarembsky committed Mar 13, 2018
    9680394

Commits on Mar 14, 2018

  1. Adding callouts for tooltips.

    Serge Zarembsky committed Mar 14, 2018
    2de44bb

Commits on Mar 15, 2018

  1. Merge pull request #5 from zarembsky/develop 

    Fixes for UI bugs in Ghostery panel related to longer strings in German language (GH-869, GH-870, GH-872)
    @christophertino
    christophertino committed Mar 15, 2018
    e6b768e

  2. Merge branch 'master' into develop

    @christophertino
    christophertino committed Mar 15, 2018
    1a22cd7

Commits on Mar 16, 2018

  1. Refactoring loading cliqz modules. Fixing GH-476.

    Serge Zarembsky committed Mar 16, 2018
    21c1015

  2. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 16, 2018
    94a85b7

Commits on Mar 19, 2018

  1. Removing old code.

    Serge Zarembsky committed Mar 19, 2018
    715aa62

  2. Removing isReady.

    Serge Zarembsky committed Mar 19, 2018
    3297c98

  3. Merge pull request #8 from zarembsky/develop 

    Refactoring load/unload of Cliqz modules, fix for GH-476.
    @jsignanini
    jsignanini committed Mar 19, 2018
    d848377

Commits on Mar 20, 2018

  1. removing background log that broke extension loading

    @christophertino
    christophertino committed Mar 20, 2018
    b800e72

  2. First pass at the updated simple view

    @IAmThePan
    IAmThePan committed Mar 20, 2018
    135777a

  3. Fix for GH-877, GH-886, GH-872.

    Serge Zarembsky committed Mar 20, 2018
    bdcba81

  4. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 20, 2018
    765f56d

  5. Removing log from manifest

    Serge Zarembsky committed Mar 20, 2018
    95b400f

  6. Added return after reject.

    Serge Zarembsky committed Mar 20, 2018
    636c05c

  7. Merge pull request #9 from zarembsky/develop 

    Fixes for GH-877, GH-872, GH-886, missing translations added.
    @jsignanini
    jsignanini committed Mar 20, 2018
    9f88345

  8. Adding return after rejects in a few places.

    Serge Zarembsky committed Mar 20, 2018
    54b5286

Commits on Mar 22, 2018

  1. Implementing flag for site-specific unblocks.

    Serge Zarembsky committed Mar 22, 2018
    6078357

  2. Using abbreviations for seconds, removing unnecessary comment.

    Serge Zarembsky committed Mar 22, 2018
    c81bd41

Commits on Mar 23, 2018

  1. Requested changes.

    Serge Zarembsky committed Mar 23, 2018
    0745205

  2. Implementing suggested changes.

    Serge Zarembsky committed Mar 23, 2018
    61a1e5c

  3. Update policy block reason name.

    @jsignanini
    jsignanini committed Mar 23, 2018
    40c1d48

  4. Update block reason names. Call allowedOnce check only when needed.

    @jsignanini
    jsignanini committed Mar 23, 2018
    6bf01a9

  5. Update JSDocs and add missing block reason.

    @jsignanini
    jsignanini committed Mar 23, 2018
    6ee32ae

  6. Update JSDocs and update block reason c2p names.

    @jsignanini
    jsignanini committed Mar 23, 2018
    b523b46

  7. Fix typo.

    @jsignanini
    jsignanini committed Mar 23, 2018
    73cc0eb

  8. Merge pull request #10 from zarembsky/develop 

    Adding return after rejects in a few places. Implementing Ghostery side of GH-885. Fix for GH-871.
    @jsignanini
    jsignanini committed Mar 23, 2018
    3db6b2b

Commits on Mar 26, 2018

  1. Added checks for non-null message

    Serge Zarembsky committed Mar 26, 2018
    587568e

Commits on Mar 27, 2018

  1. add NO_LINT env option 

    readme add disable lint
    @trickpattyFH20
    trickpattyFH20 committed Mar 27, 2018
    adfb1e4

  2. use npm ci(continuous integration) install command per npm 5.7.1

    @trickpattyFH20
    trickpattyFH20 committed Mar 27, 2018
    6164935

  3. Merge pull request #14 from trickpattyFH20/develop 

    Add option to disable ESLint
    @christophertino
    christophertino committed Mar 27, 2018
    cf201b5

Commits on Mar 28, 2018

  1. Fixing GH-872

    Serge Zarembsky committed Mar 28, 2018
    dde6adb

  2. Updated simple view and detailed expert and condensed views.

    @IAmThePan
    IAmThePan committed Mar 28, 2018
    1805ed0

  3. initial webpack 4 build 

    migrate to mini css plugin

webpack 4 mode option

fix eval err
    @trickpattyFH20
    trickpattyFH20 committed Mar 28, 2018
    9748fa9

Commits on Mar 29, 2018

  1. Merge branch 'develop' into feature/webpack-4-upgrade

    @christophertino
    christophertino committed Mar 29, 2018
    37e6e2e

  2. Merge pull request #16 from trickpattyFH20/feature/webpack-4-upgrade 

    webpack 4 upgrade
    @christophertino
    christophertino committed Mar 29, 2018
    ce103eb

  3. make pattern matcher case insensitive + unit test

    @christophertino
    christophertino committed Mar 29, 2018
    09e4d41

  4. fix redux actions with missing returns in setup app

    @christophertino
    christophertino committed Mar 29, 2018
    e81002e

  5. remove verbose webpack output

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    7e6a6a4

  6. add verbose to build.watch

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    189fa1d

  7. Merge branch 'develop' into feature/webpack-4-upgrade

    @christophertino
    christophertino committed Mar 29, 2018
    d39176f

  8. Optimize tooltips and notifications

    @IAmThePan
    IAmThePan committed Mar 29, 2018
    af508ce

  9. Merge pull request #18 from trickpattyFH20/feature/webpack-4-upgrade 

    remove verbose webpack output
    @jsignanini
    jsignanini committed Mar 29, 2018
    ad33142

  10. update CONTRIBUTING to allow patches via email. Fixes #6

    @christophertino
    christophertino committed Mar 29, 2018
    4aa116b

  11. Fix linting errors

    @IAmThePan
    IAmThePan committed Mar 29, 2018
    e4887b4

  12. fix lint on change regression

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    3bbdfe5

Commits on Mar 30, 2018

  1. output lint after webpack output

    @trickpattyFH20
    trickpattyFH20 committed Mar 30, 2018
    a5dfd69

  2. done rr

    @trickpattyFH20
    trickpattyFH20 committed Mar 30, 2018
    c13afec

  3. Add jest tests for PauseButton.jxs

    @IAmThePan
    IAmThePan committed Mar 30, 2018
    d686bae

  4. Changes in response to PR requested changes.

    Serge Zarembsky committed Mar 30, 2018
    355487e

Commits on Apr 2, 2018

  1. GH-863 update tooltip and notification logic

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    9f76c0c

  2. GH-876 updated header tabs

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    9036eaf

  3. GH-867 update alternate POC

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    b896758

Commits on Apr 3, 2018

  1. Merge pull request #20 from trickpattyFH20/feature/fix-lint-on-change 

    Feature/fix lint on change
    @jsignanini
    jsignanini committed Apr 3, 2018
    523cbcb

  2. Requested changes.

    Serge Zarembsky committed Apr 3, 2018
    6e62d5f

  3. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Apr 3, 2018
    795a120

  4. Merge pull request #15 from zarembsky/develop 

    Fix for GH-872, "Not Scanned" case.
    @jsignanini
    jsignanini committed Apr 3, 2018
    2c66dfc

  5. GH-888 updated pause button location and tooltips

    @IAmThePan
    IAmThePan committed Apr 3, 2018
    865bc1f

  6. upgrade webpack and fix watch scss bug

    @trickpattyFH20
    trickpattyFH20 committed Apr 3, 2018
    c7ccfac

  7. GH-908 Un-swapped text on cliqz-features page on setup flow

    @IAmThePan
    IAmThePan committed Apr 3, 2018
    3d09a37

  8. fix watch lint scss

    @trickpattyFH20
    trickpattyFH20 committed Apr 3, 2018
    df32e54

Commits on Apr 4, 2018

  1. Merge pull request #26 from trickpattyFH20/develop 

    upgrade webpack and fix watch scss bug
    @jsignanini
    jsignanini committed Apr 4, 2018
    03a6be5

  2. Merge branch 'develop' into gh-908

    @jsignanini
    jsignanini committed Apr 4, 2018
    8474938

  3. Merge pull request #27 from IAmThePan/gh-908 

    GH-908 Un-swapped text on cliqz-features page on setup flow
    @jsignanini
    jsignanini committed Apr 4, 2018
    7c4d58f

  4. Set default Summary to new Pause Button position

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    9824b00

  5. update package-lock file

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    7553c2a

  6. Merge Simple View changes into Develop

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    fb078cd

  7. Fix linting errors

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    c30cef1

  8. Fix error where panel wasn't displaying

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    ab78614

  9. Fix jsdoc issues

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    78f04ae

  10. check for chrome newtab before calling injectScript

    @christophertino
    christophertino committed Apr 4, 2018
    61ce7be

  11. Merge pull request #25 from IAmThePan/simple-view-merge 

    Updated summary view.
    @jsignanini
    jsignanini committed Apr 4, 2018
    b9cdcd3

  12. cleanup extraneous object property checks

    @christophertino
    christophertino committed Apr 4, 2018
    9b2ed2e

  13. Merge branch 'feature/newtab_check' into develop

    @christophertino
    christophertino committed Apr 4, 2018
    cada891

  14. udpate docs

    @christophertino
    christophertino committed Apr 4, 2018
    3f48081

Commits on Apr 5, 2018

  1. Create pipeline steps to control whitelisting of antitracking and adb… 

    …locker from Ghostery side
    @sammacbeth
    sammacbeth committed Apr 5, 2018
    2b12a89

  2. Update Cliqz bundle to 1.26.1

    @sammacbeth
    sammacbeth committed Apr 5, 2018
    05ceff9

  3. WIP nightly builds on jenkins

    @sammacbeth
    sammacbeth committed Apr 5, 2018
    82d8b4b

  4. Merge pull request #23 from sammacbeth/cliqz-whitelisting-actions 

    Refactor integration ghostery whitelisting with Cliqz modules
    @jsignanini
    jsignanini committed Apr 5, 2018
    c431b0e

Commits on Apr 6, 2018

  1. Publish with build number.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    ebdfaa0

  2. Use package-lock.json in docker.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    7718afe

  3. Test moab makezip

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    924458a

  4. WIP fetch up-to-date libraries for build.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    cfc2f0f

  5. Add option to build with browser-core master

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    6db0d29

  6. Add signing step.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    15e9f78

  7. Panel Fixes: Fix CSS SVG encoding for FF

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    9697aae

  8. Panel Fixes: HTML encode inline SVGs

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    58e8816

  9. Panel Fixes: Edge bug fixes (GH-911)

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    bf28571

Commits on Apr 9, 2018

  1. GH-867 Alternate Summary View AB Test

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    08fc2da

  2. Fix overflow scroll issue

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    0266a29

  3. Toggle Summary AB test off

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    d30db63

  4. Merge pull request #28 from IAmThePan/develop 

    Panel Bug Fixes
    @jsignanini
    jsignanini committed Apr 9, 2018
    99d9bec

  5. Fix tooltip scroll issue

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    f1b7132

  6. Merge remote-tracking branch 'upstream/develop' into develop

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    66426bd

  7. Make browser-core log.

    @sammacbeth
    sammacbeth committed Apr 9, 2018
    24d8cbc

  8. Merge pull request #29 from IAmThePan/develop 

    Fix scroll issue with tooltip
    @jsignanini
    jsignanini committed Apr 9, 2018
    bfb625f

  9. adding utm check to ghostery.com

    @christophertino
    christophertino committed Apr 9, 2018
    ed78465

Commits on Apr 10, 2018

  1. Load github credentials to enable moab checkout of ghostery-libraries.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    07a7569

  2. Tidy deployment.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    af79226

  3. Add Chrome packaging step.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    e071f77

  4. Merge branch 'develop' into nightly

    @christophertino
    christophertino committed Apr 10, 2018
    e8c74b9

  5. Merge pull request #32 from sammacbeth/nightly 

    Automated extension builds
    @christophertino
    christophertino committed Apr 10, 2018
    1836775

Commits on Apr 12, 2018

  1. GH-862: Unit tests for the Panel (#31) 

    * GH-862 Add unit tests for the Panel: Pause Button Snapshot, Summary Actions & Reducers

* Update reducers to test for immutable state
    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 12, 2018
    48b74b0

  2. Publish beta builds for cliqz and chrome. (#33)

    @sammacbeth @christophertino
    sammacbeth authored and christophertino committed Apr 12, 2018
    f559662

Commits on Apr 13, 2018

  1. Fix for Ghostery in Cliqz issues (#37)

    @christophertino
    Serge Zarembsky authored and christophertino committed Apr 13, 2018
    a901ce8

Commits on Apr 18, 2018

  1. update changelog and bump version

    @christophertino
    christophertino committed Apr 18, 2018
    3585107

  2. GH-955: Update Smart Blocking icon on Tracker List

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    09b9cd1

  3. GH-954: Fix spelling error for Anti-Tracking ON notification

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    6f64bc1

  4. GH-953 fix bug where pause button is off by 1px

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    f810d7d

Commits on Apr 19, 2018

  1. bump browser-core version

    @christophertino
    christophertino committed Apr 19, 2018
    5fc5e22

  2. add minimum_opera_version to manifest

    @christophertino
    christophertino committed Apr 19, 2018
    46f7ce1

Commits on Apr 23, 2018

  1. integrity check browser-core workaround (#45)

    @trickpattyFH20 @jsignanini
    trickpattyFH20 authored and jsignanini committed Apr 23, 2018
    5fa827f

  2. Fix for GH-952 (#40)

    @jsignanini
    Serge Zarembsky authored and jsignanini committed Apr 23, 2018
    f9f2680

Commits on Apr 24, 2018

  1. omit firefox about:pages from content script injection

    @christophertino
    christophertino committed Apr 24, 2018
    83003f5

  2. Smart Block: Don't block mixed content from localhost. Fixes #44 and … 

    …GH-875
    @christophertino
    christophertino committed Apr 24, 2018
    5323f08

Commits on Apr 25, 2018

  1. GH-1021 Add browser version to metrics

    @christophertino
    christophertino committed Apr 25, 2018
    84cf489

  2. GH-889 limit send of utm_source and utm_campaign metrics

    @christophertino
    christophertino committed Apr 25, 2018
    f00e1f9

Commits on Apr 26, 2018

  1. Updated webpack

    Serge Zarembsky committed Apr 26, 2018
    86625ac

  2. Fixes for GH-1001 and GH-1022

    Serge Zarembsky committed Apr 26, 2018
    df10b3d