262ca37

Fix for GH-859

Mar 8, 2018

504680e

Linting.

Mar 8, 2018

b16336d

Change to be able to run unit tests on Windows.

Mar 8, 2018

181ebd8

add CODEOWNERS file

christophertino Mar 8, 2018

a22b090

Merge branch 'develop' into feature/gh-859

christophertino Mar 8, 2018

4bcdb53

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

christophertino Mar 9, 2018

8318f2c

Fixes for GH-869, GH-870.

Mar 12, 2018

c3fb116

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

Mar 12, 2018

eb3baea

Fix for GH-872

Mar 13, 2018

9680394

Fixing lint errors.

Mar 13, 2018

2de44bb

Adding callouts for tooltips.

Mar 14, 2018

e6b768e

Merge pull request #5 from zarembsky/develop

christophertino Mar 15, 2018

1a22cd7

Merge branch 'master' into develop

christophertino Mar 15, 2018

21c1015

Refactoring loading cliqz modules. Fixing GH-476.

Mar 16, 2018

94a85b7

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

Mar 16, 2018

715aa62

Removing old code.

Mar 19, 2018

3297c98

Removing isReady.

Mar 19, 2018

d848377

Merge pull request #8 from zarembsky/develop

jsignanini Mar 19, 2018

b800e72

removing background log that broke extension loading

christophertino Mar 20, 2018

135777a

First pass at the updated simple view

IAmThePan Mar 20, 2018

bdcba81

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

Mar 20, 2018

765f56d

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

Mar 20, 2018

95b400f

Removing log from manifest

Mar 20, 2018

636c05c

Added return after reject.

Mar 20, 2018

9f88345

Merge pull request #9 from zarembsky/develop

jsignanini Mar 20, 2018

54b5286

Adding return after rejects in a few places.

Mar 20, 2018

6078357

Implementing flag for site-specific unblocks.

Mar 22, 2018

c81bd41

Using abbreviations for seconds, removing unnecessary comment.

Mar 22, 2018

0745205

Requested changes.

Mar 23, 2018

61a1e5c

Implementing suggested changes.

Mar 23, 2018

40c1d48

Update policy block reason name.

jsignanini Mar 23, 2018

6bf01a9

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

jsignanini Mar 23, 2018

6ee32ae

Update JSDocs and add missing block reason.

jsignanini Mar 23, 2018

b523b46

Update JSDocs and update block reason c2p names.

jsignanini Mar 23, 2018

73cc0eb

Fix typo.

jsignanini Mar 23, 2018

3db6b2b

Merge pull request #10 from zarembsky/develop

jsignanini Mar 23, 2018

587568e

Added checks for non-null message

Mar 26, 2018

adfb1e4

add NO_LINT env option

trickpattyFH20 Mar 27, 2018

6164935

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

trickpattyFH20 Mar 27, 2018

cf201b5

Merge pull request #14 from trickpattyFH20/develop

christophertino Mar 27, 2018

dde6adb

Fixing GH-872

Mar 28, 2018

1805ed0

Updated simple view and detailed expert and condensed views.

IAmThePan Mar 28, 2018

9748fa9

initial webpack 4 build

trickpattyFH20 Mar 28, 2018

37e6e2e

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

christophertino Mar 29, 2018

ce103eb

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

christophertino Mar 29, 2018

09e4d41

make pattern matcher case insensitive + unit test

christophertino Mar 29, 2018

e81002e

fix redux actions with missing returns in setup app

christophertino Mar 29, 2018

7e6a6a4

remove verbose webpack output

trickpattyFH20 Mar 29, 2018

189fa1d

add verbose to build.watch

trickpattyFH20 Mar 29, 2018

d39176f

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

christophertino Mar 29, 2018

af508ce

Optimize tooltips and notifications

IAmThePan Mar 29, 2018

ad33142

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

jsignanini Mar 29, 2018

4aa116b

update CONTRIBUTING to allow patches via email. Fixes #6

christophertino Mar 29, 2018

e4887b4

Fix linting errors

IAmThePan Mar 29, 2018

3bbdfe5

fix lint on change regression

trickpattyFH20 Mar 29, 2018

a5dfd69

output lint after webpack output

trickpattyFH20 Mar 30, 2018

c13afec

done rr

trickpattyFH20 Mar 30, 2018

d686bae

Add jest tests for PauseButton.jxs

IAmThePan Mar 30, 2018

355487e

Changes in response to PR requested changes.

Mar 30, 2018

9f76c0c

GH-863 update tooltip and notification logic

IAmThePan Apr 2, 2018

9036eaf

GH-876 updated header tabs

IAmThePan Apr 2, 2018

b896758

GH-867 update alternate POC

IAmThePan Apr 2, 2018

523cbcb

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

jsignanini Apr 3, 2018

6e62d5f

Requested changes.

Apr 3, 2018

795a120

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

Apr 3, 2018

2c66dfc

Merge pull request #15 from zarembsky/develop

jsignanini Apr 3, 2018

865bc1f

GH-888 updated pause button location and tooltips

IAmThePan Apr 3, 2018

c7ccfac

upgrade webpack and fix watch scss bug

trickpattyFH20 Apr 3, 2018

3d09a37

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

IAmThePan Apr 3, 2018

df32e54

fix watch lint scss

trickpattyFH20 Apr 3, 2018

03a6be5

Merge pull request #26 from trickpattyFH20/develop

jsignanini Apr 4, 2018

8474938

Merge branch 'develop' into gh-908

jsignanini Apr 4, 2018

7c4d58f

Merge pull request #27 from IAmThePan/gh-908

jsignanini Apr 4, 2018

9824b00

Set default Summary to new Pause Button position

IAmThePan Apr 4, 2018

7553c2a

update package-lock file

IAmThePan Apr 4, 2018

fb078cd

Merge Simple View changes into Develop

IAmThePan Apr 4, 2018

c30cef1

Fix linting errors

IAmThePan Apr 4, 2018

ab78614

Fix error where panel wasn't displaying

IAmThePan Apr 4, 2018

78f04ae

Fix jsdoc issues

IAmThePan Apr 4, 2018

61ce7be

check for chrome newtab before calling injectScript

christophertino Apr 4, 2018

b9cdcd3

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

jsignanini Apr 4, 2018

9b2ed2e

cleanup extraneous object property checks

christophertino Apr 4, 2018

cada891

Merge branch 'feature/newtab_check' into develop

christophertino Apr 4, 2018

3f48081

udpate docs

christophertino Apr 4, 2018

2b12a89

Create pipeline steps to control whitelisting of antitracking and adb…

sammacbeth Mar 26, 2018

05ceff9

Update Cliqz bundle to 1.26.1

sammacbeth Apr 3, 2018

82d8b4b

WIP nightly builds on jenkins

sammacbeth Apr 5, 2018

c431b0e

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

jsignanini Apr 5, 2018

ebdfaa0

Publish with build number.

sammacbeth Apr 6, 2018

7718afe

Use package-lock.json in docker.

sammacbeth Apr 6, 2018

924458a

Test moab makezip

sammacbeth Apr 6, 2018

cfc2f0f

WIP fetch up-to-date libraries for build.

sammacbeth Apr 6, 2018

6db0d29

Add option to build with browser-core master

sammacbeth Apr 6, 2018

15e9f78

Add signing step.

sammacbeth Apr 6, 2018

9697aae

Panel Fixes: Fix CSS SVG encoding for FF

IAmThePan Apr 6, 2018

58e8816

Panel Fixes: HTML encode inline SVGs

IAmThePan Apr 6, 2018

bf28571

Panel Fixes: Edge bug fixes (GH-911)

IAmThePan Apr 6, 2018

08fc2da

GH-867 Alternate Summary View AB Test

IAmThePan Apr 9, 2018

0266a29

Fix overflow scroll issue

IAmThePan Apr 9, 2018

d30db63

Toggle Summary AB test off

IAmThePan Apr 9, 2018

99d9bec

Merge pull request #28 from IAmThePan/develop

jsignanini Apr 9, 2018

f1b7132

Fix tooltip scroll issue

IAmThePan Apr 9, 2018

66426bd

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

IAmThePan Apr 9, 2018

24d8cbc

Make browser-core log.

sammacbeth Apr 9, 2018

bfb625f

Merge pull request #29 from IAmThePan/develop

jsignanini Apr 9, 2018

ed78465

adding utm check to ghostery.com

christophertino Apr 9, 2018

07a7569

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

sammacbeth Apr 10, 2018

af79226

Tidy deployment.

sammacbeth Apr 10, 2018

e071f77

Add Chrome packaging step.

sammacbeth Apr 10, 2018

e8c74b9

Merge branch 'develop' into nightly

christophertino Apr 10, 2018

1836775

Merge pull request #32 from sammacbeth/nightly

christophertino Apr 10, 2018

48b74b0

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

IAmThePan Apr 12, 2018

f559662

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

sammacbeth Apr 12, 2018

a901ce8

Fix for Ghostery in Cliqz issues (#37)

Apr 13, 2018

3585107

update changelog and bump version

christophertino Apr 18, 2018

09b9cd1

GH-955: Update Smart Blocking icon on Tracker List

IAmThePan Apr 17, 2018

6f64bc1

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

IAmThePan Apr 17, 2018

f810d7d

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

IAmThePan Apr 18, 2018

5fc5e22

bump browser-core version

christophertino Apr 19, 2018

46f7ce1

add minimum_opera_version to manifest

christophertino Apr 19, 2018

5fa827f

integrity check browser-core workaround (#45)

trickpattyFH20 Apr 23, 2018

f9f2680

Fix for GH-952 (#40)

Apr 23, 2018

83003f5

omit firefox about:pages from content script injection

christophertino Apr 24, 2018

5323f08

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

christophertino Apr 24, 2018

84cf489

GH-1021 Add browser version to metrics

christophertino Apr 25, 2018

f00e1f9

GH-889 limit send of utm_source and utm_campaign metrics

christophertino Apr 25, 2018

86625ac

Updated webpack

Apr 26, 2018

df10b3d

Fixes for GH-1001 and GH-1022

Apr 26, 2018