+28 −12

.eslintrc.js

.eslintrc.js

+3 −0

messages.json

_locales/en/messages.json

+23 −21

AccountReducer.js

app/Account/AccountReducer.js

+5 −5

click_to_play.js

app/content-scripts/click_to_play.js

+2 −1

page_performance.js

app/content-scripts/page_performance.js

+0 −2

msg.js

app/content-scripts/utils/msg.js

+2 −1

AppView.jsx

app/hub/Views/AppView/AppView.jsx

+9 −6

AppViewContainer.jsx

app/hub/Views/AppView/AppViewContainer.jsx

+5 −4

AppViewReducer.js

app/hub/Views/AppView/AppViewReducer.js

+2 −2

index.js

app/hub/Views/AppView/index.js

+1 −1

CreateAccountView.jsx

app/hub/Views/CreateAccountView/CreateAccountView.jsx

+28 −29

CreateAccountViewContainer.jsx

...ews/CreateAccountView/CreateAccountViewContainer.jsx

+1 −1

CreateAccountView.test.jsx.snap

...ests__/__snapshots__/CreateAccountView.test.jsx.snap

+4 −4

index.js

app/hub/Views/CreateAccountView/index.js

+16 −15

HomeViewContainer.jsx

app/hub/Views/HomeView/HomeViewContainer.jsx

+12 −13

HomeViewReducer.js

app/hub/Views/HomeView/HomeViewReducer.js

+2 −2

index.js

app/hub/Views/HomeView/index.js

+22 −23

LogInViewContainer.jsx

app/hub/Views/LogInView/LogInViewContainer.jsx

+4 −4

index.js

app/hub/Views/LogInView/index.js

+8 −7

PlusViewContainer.jsx

app/hub/Views/PlusView/PlusViewContainer.jsx

+4 −4

index.js

app/hub/Views/PlusView/index.js

+4 −4

ProductsView.jsx

app/hub/Views/ProductsView/ProductsView.jsx

+4 −3

ProductsViewContainer.jsx

app/hub/Views/ProductsView/ProductsViewContainer.jsx

+1 −1

index.js

app/hub/Views/ProductsView/index.js

+1 −1

SetupView.jsx

app/hub/Views/SetupView/SetupView.jsx

+20 −14

SetupViewContainer.jsx

app/hub/Views/SetupView/SetupViewContainer.jsx

+18 −29

SetupViewReducer.js

app/hub/Views/SetupView/SetupViewReducer.js

+8 −7

index.js

app/hub/Views/SetupView/index.js

+2 −2

SetupAntiSuiteView.jsx

...SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.jsx

+11 −9

SetupAntiSuiteViewContainer.jsx

...s/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx

+5 −4

index.js

app/hub/Views/SetupViews/SetupAntiSuiteView/index.js

+5 −5

SetupBlockingDropdown.jsx

...iews/SetupBlockingDropdown/SetupBlockingDropdown.jsx

+4 −2

SetupBlockingDropdownContainer.jsx

...pBlockingDropdown/SetupBlockingDropdownContainer.jsx

+2 −2

index.js

app/hub/Views/SetupViews/SetupBlockingDropdown/index.js

+12 −6

SetupBlockingView.jsx

...s/SetupViews/SetupBlockingView/SetupBlockingView.jsx

+1 −1

SetupBlockingViewActions.js

...pViews/SetupBlockingView/SetupBlockingViewActions.js

+6 −3

SetupBlockingViewContainer.jsx

...ews/SetupBlockingView/SetupBlockingViewContainer.jsx

+4 −0

SetupBlockingView.test.jsx

...tupBlockingView/__tests__/SetupBlockingView.test.jsx

+2 −2

SetupBlockingViewActions.test.js

...ckingView/__tests__/SetupBlockingViewActions.test.js

+6 −5

index.js

app/hub/Views/SetupViews/SetupBlockingView/index.js

+2 −2

SetupDoneView.jsx

...hub/Views/SetupViews/SetupDoneView/SetupDoneView.jsx

+1 −1

SetupDoneViewActions.js

...ews/SetupViews/SetupDoneView/SetupDoneViewActions.js

+2 −2

SetupDoneViewActions.test.js

...SetupDoneView/__tests__/SetupDoneViewActions.test.js

+6 −5

index.js

app/hub/Views/SetupViews/SetupDoneView/index.js

+3 −3

SetupHeader.jsx

app/hub/Views/SetupViews/SetupHeader/SetupHeader.jsx

+4 −4

SetupHumanWebView.jsx

...s/SetupViews/SetupHumanWebView/SetupHumanWebView.jsx

+1 −1

SetupHumanWebViewActions.js

...pViews/SetupHumanWebView/SetupHumanWebViewActions.js

+10 −7

SetupHumanWebViewContainer.jsx

...ews/SetupHumanWebView/SetupHumanWebViewContainer.jsx

+2 −2

SetupHumanWebViewActions.test.js

...anWebView/__tests__/SetupHumanWebViewActions.test.js

+5 −4

index.js

app/hub/Views/SetupViews/SetupHumanWebView/index.js

+12 −5

SetupNavigationContainer.jsx

...upViews/SetupNavigation/SetupNavigationContainer.jsx

+1 −1

index.js

app/hub/Views/SetupViews/SetupNavigation/index.js

+10 −8

SideNavigationViewContainer.jsx

...s/SideNavigationView/SideNavigationViewContainer.jsx

+4 −4

index.js

app/hub/Views/SideNavigationView/index.js

+2 −2

SignedInView.jsx

app/hub/Views/SignedInView/SignedInView.jsx

+4 −3

TutorialViewContainer.jsx

app/hub/Views/TutorialView/TutorialViewContainer.jsx

+11 −8

TutorialViewReducer.js

app/hub/Views/TutorialView/TutorialViewReducer.js

+2 −2

index.js

app/hub/Views/TutorialView/index.js

+1 −1

TutorialAntiSuiteViewActions.js

...utorialAntiSuiteView/TutorialAntiSuiteViewActions.js

+2 −1

TutorialAntiSuiteViewContainer.jsx

...rialAntiSuiteView/TutorialAntiSuiteViewContainer.jsx

+2 −2

TutorialAntiSuiteViewActions.test.js

...teView/__test__/TutorialAntiSuiteViewActions.test.js

+3 −3

index.js

...b/Views/TutorialViews/TutorialAntiSuiteView/index.js

+2 −2

index.js

...ub/Views/TutorialViews/TutorialBlockingView/index.js

+2 −2

index.js

app/hub/Views/TutorialViews/TutorialLayoutView/index.js

+13 −5

TutorialNavigationContainer.jsx

...s/TutorialNavigation/TutorialNavigationContainer.jsx

+1 −1

index.js

app/hub/Views/TutorialViews/TutorialNavigation/index.js

+2 −2

index.js

...Views/TutorialViews/TutorialTrackerListView/index.js

+2 −2

index.js

app/hub/Views/TutorialViews/TutorialTrustView/index.js

+1 −1

TutorialVideoView.jsx

...utorialViews/TutorialVideoView/TutorialVideoView.jsx

+2 −2

index.js

app/hub/Views/TutorialViews/TutorialVideoView/index.js

+3 −2

License.jsx

app/licenses/License.jsx

+2 −2

Licenses.jsx

app/licenses/Licenses.jsx

+1 −1

cliqzActions.js

app/panel-android/actions/cliqzActions.js

+41 −41

trackerActions.js

app/panel-android/actions/trackerActions.js

+8 −4

GlobalTrackers.jsx

app/panel-android/components/GlobalTrackers.jsx

+19 −10

Overview.jsx

app/panel-android/components/Overview.jsx

+16 −11

Panel.jsx

app/panel-android/components/Panel.jsx

+6 −3

SiteTrackers.jsx

app/panel-android/components/SiteTrackers.jsx

+61 −36

Accordion.jsx

app/panel-android/components/content/Accordion.jsx

+11 −5

Accordions.jsx

app/panel-android/components/content/Accordions.jsx

+11 −9

ChartSVG.jsx

app/panel-android/components/content/ChartSVG.jsx

+8 −4

DotsMenu.jsx

app/panel-android/components/content/DotsMenu.jsx

+27 −19

FixedMenu.jsx

app/panel-android/components/content/FixedMenu.jsx

+26 −13

MenuItem.jsx

app/panel-android/components/content/MenuItem.jsx

+27 −25

Path.jsx

app/panel-android/components/content/Path.jsx

+5 −3

Tab.jsx

app/panel-android/components/content/Tab.jsx

+11 −6

Tabs.jsx

app/panel-android/components/content/Tabs.jsx

+53 −35

TrackerItem.jsx

app/panel-android/components/content/TrackerItem.jsx

+4 −2

TrackersChart.jsx

app/panel-android/components/content/TrackersChart.jsx

+2 −2

chart.js

app/panel-android/utils/chart.js

+1 −1

DetailActions.js

app/panel/actions/DetailActions.js

+1 −0

SettingsActions.js

app/panel/actions/SettingsActions.js

+1 −2

SummaryActions.js

app/panel/actions/SummaryActions.js

+3 −3

AccountSuccess.jsx

app/panel/components/AccountSuccess.jsx

+119 −75

Blocking.jsx

app/panel/components/Blocking.jsx

+98 −61

BlockingHeader.jsx

app/panel/components/Blocking/BlockingHeader.jsx

+21 −12

Categories.jsx

app/panel/components/Blocking/Categories.jsx

+117 −67

Category.jsx

app/panel/components/Blocking/Category.jsx

+20 −15

GlobalTracker.jsx

app/panel/components/Blocking/GlobalTracker.jsx

+157 −110

Tracker.jsx

app/panel/components/Blocking/Tracker.jsx

+28 −15

Trackers.jsx

app/panel/components/Blocking/Trackers.jsx

+8 −5

ClickOutside.jsx

app/panel/components/BuildingBlocks/ClickOutside.jsx

+31 −31

CliqzFeature.jsx

app/panel/components/BuildingBlocks/CliqzFeature.jsx

+68 −54

DonutGraph.jsx

app/panel/components/BuildingBlocks/DonutGraph.jsx

+18 −17

GhosteryFeature.jsx

app/panel/components/BuildingBlocks/GhosteryFeature.jsx

+3 −3

NotScanned.jsx

app/panel/components/BuildingBlocks/NotScanned.jsx

+9 −6

PauseButton.jsx

app/panel/components/BuildingBlocks/PauseButton.jsx

+5 −9

RadioButtonGroup.jsx

...panel/components/BuildingBlocks/RadioButtonGroup.jsx

+26 −23

StatsGraph.jsx

app/panel/components/BuildingBlocks/StatsGraph.jsx

+17 −15

ToggleSlider.jsx

app/panel/components/BuildingBlocks/ToggleSlider.jsx

+7 −6

CreateAccount.jsx

app/panel/components/CreateAccount.jsx

+21 −8

Detail.jsx

app/panel/components/Detail.jsx

+14 −9

DetailMenu.jsx

app/panel/components/DetailMenu.jsx

+32 −21

Header.jsx

app/panel/components/Header.jsx

+28 −23

HeaderMenu.jsx

app/panel/components/HeaderMenu.jsx

+1 −1

Help.jsx

app/panel/components/Help.jsx

+9 −7

Login.jsx

app/panel/components/Login.jsx

+41 −33

Panel.jsx

app/panel/components/Panel.jsx

+72 −70

Rewards.jsx

app/panel/components/Rewards.jsx

+123 −32

Settings.jsx

app/panel/components/Settings.jsx

+8 −4

Account.jsx

app/panel/components/Settings/Account.jsx

+58 −18

GeneralSettings.jsx

app/panel/components/Settings/GeneralSettings.jsx

+18 −11

GlobalBlocking.jsx

app/panel/components/Settings/GlobalBlocking.jsx

+45 −48

Notifications.jsx

app/panel/components/Settings/Notifications.jsx

+40 −43

OptIn.jsx

app/panel/components/Settings/OptIn.jsx

+72 −75

Purplebox.jsx

app/panel/components/Settings/Purplebox.jsx

+2 −2

SettingsMenu.jsx

app/panel/components/Settings/SettingsMenu.jsx

+2 −1

Site.jsx

app/panel/components/Settings/Site.jsx

+2 −3

Sites.jsx

app/panel/components/Settings/Sites.jsx

+59 −57

TrustAndRestrict.jsx

app/panel/components/Settings/TrustAndRestrict.jsx

+36 −49

TrustAndRestrict.jsx

...l/components/Settings/__tests__/TrustAndRestrict.jsx

+16 −12

Stats.jsx

app/panel/components/Stats.jsx

+1 −1

StatsView.jsx

app/panel/components/StatsView.jsx

+3 −3

Subscribe.jsx

app/panel/components/Subscribe.jsx

+20 −9

Subscription.jsx

app/panel/components/Subscription.jsx

+2 −2

SubscriptionInfo.jsx

app/panel/components/Subscription/SubscriptionInfo.jsx

+4 −4

SubscriptionThemes.jsx

...panel/components/Subscription/SubscriptionThemes.jsx

+108 −74

Summary.jsx

app/panel/components/Summary.jsx

+20 −16

Tooltip.jsx

app/panel/components/Tooltip.jsx

+90 −78

PauseButton.jsx

app/panel/components/__tests__/PauseButton.jsx

+25 −23

Rewards.jsx

app/panel/components/__tests__/Rewards.jsx

+3 −2

AccountSuccessContainer.js

app/panel/containers/AccountSuccessContainer.js

+3 −2

BlockingContainer.js

app/panel/containers/BlockingContainer.js

+3 −2

CreateAccountContainer.js

app/panel/containers/CreateAccountContainer.js

+6 −4

DetailContainer.js

app/panel/containers/DetailContainer.js

+3 −2

HeaderContainer.js

app/panel/containers/HeaderContainer.js

+2 −3

LoginContainer.js

app/panel/containers/LoginContainer.js

+8 −3

PanelContainer.js

app/panel/containers/PanelContainer.js

+1 −3

RewardsContainer.js

app/panel/containers/RewardsContainer.js

+4 −3

SettingsContainer.js

app/panel/containers/SettingsContainer.js

+1 −1

StatsContainer.js

app/panel/containers/StatsContainer.js

+5 −4

SubscriptionContainer.js

app/panel/containers/SubscriptionContainer.js

+4 −2

SummaryContainer.js

app/panel/containers/SummaryContainer.js

+2 −1

DynamicUIPortContext.js

app/panel/contexts/DynamicUIPortContext.js

+2 −1

ThemeContext.js

app/panel/contexts/ThemeContext.js

+82 −83

blocking.js

app/panel/reducers/blocking.js

+175 −156

panel.js

app/panel/reducers/panel.js

+2 −2

rewards.js

app/panel/reducers/rewards.js

+108 −105

settings.js

app/panel/reducers/settings.js

+38 −38

summary.js

app/panel/reducers/summary.js

+36 −36

blocking.js

app/panel/utils/blocking.js

+5 −5

utils.js

app/panel/utils/utils.js

+2 −2

_upgrade_banner.scss

app/scss/partials/_upgrade_banner.scss

+6 −4

ForgotPassword.jsx

app/shared-components/ForgotPassword/ForgotPassword.jsx

+1 −1

ForgotPasswordContainer.js

...components/ForgotPassword/ForgotPasswordContainer.js

+4 −4

Modal.jsx

app/shared-components/Modal/Modal.jsx

+22 −9

PromoModal.jsx

app/shared-components/PromoModal/PromoModal.jsx

+2 −2

PromoModalContainer.js

app/shared-components/PromoModal/PromoModalContainer.js

+2 −2

index.js

app/shared-components/PromoModal/index.js

+1 −1

SteppedNavigation.jsx

...d-components/SteppedNavigation/SteppedNavigation.jsx

+6 −6

ToastMessage.jsx

app/shared-components/ToastMessage/ToastMessage.jsx

+5 −5

ToggleCheckbox.jsx

app/shared-components/ToggleCheckbox/ToggleCheckbox.jsx

+4 −4

ToggleSwitch.jsx

app/shared-components/ToggleSwitch/ToggleSwitch.jsx

+2 −2

package.json

package.json

+154 −145

background.js

src/background.js

+17 −13

Account.js

src/classes/Account.js

+3 −4

BrowserButton.js

src/classes/BrowserButton.js

+67 −71

BugDb.js

src/classes/BugDb.js

+8 −8

CMP.js

src/classes/CMP.js

+6 −6

Click2PlayDb.js

src/classes/Click2PlayDb.js

+2 −2

CompatibilityDb.js

src/classes/CompatibilityDb.js

+7 −8

Conf.js

src/classes/Conf.js

+9 −10

ConfData.js

src/classes/ConfData.js

+4 −5

Dispatcher.js

src/classes/Dispatcher.js

+60 −61

EventHandlers.js

src/classes/EventHandlers.js

+4 −54

ExtMessenger.js

src/classes/ExtMessenger.js

+56 −51

FoundBugs.js

src/classes/FoundBugs.js

+63 −0

KordInjector.js

src/classes/KordInjector.js

+25 −28

Metrics.js

src/classes/Metrics.js

+1 −3

Module.js

src/classes/Module.js

+80 −79

PanelData.js

src/classes/PanelData.js

+15 −16

Policy.js

src/classes/Policy.js

+20 −20

PolicySmartBlock.js

src/classes/PolicySmartBlock.js

+1 −1

PromoModals.js

src/classes/PromoModals.js

+2 −7

PurpleBox.js

src/classes/PurpleBox.js

+4 −8

Rewards.js

src/classes/Rewards.js

+3 −2

SurrogateDb.js

src/classes/SurrogateDb.js

+2 −4

TabInfo.js

src/classes/TabInfo.js

+3 −3

api.js

src/utils/api.js

+27 −30

click2play.js

src/utils/click2play.js

+4 −2

cliqzModulesData.js

src/utils/cliqzModulesData.js

+12 −12

cliqzSettingImport.js

src/utils/cliqzSettingImport.js

+8 −29

common.js

src/utils/common.js

+45 −43

matcher.js

src/utils/matcher.js

+11 −7

utils.js

src/utils/utils.js

+1 −1

Foundbugs.test.js

test/src/Foundbugs.test.js

+34 −34

Policy.test.js

test/src/Policy.test.js

+7 −7

PolicySmartBlock.test.js

test/src/PolicySmartBlock.test.js

+2 −0

matcher.test.js

test/utils/matcher.test.js

+7 −7

leet-en.js

tools/leet/leet-en.js