Skip to content
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

GH-1979 Allow user selection of Ad Block filter lists #527

Merged
merged 5 commits into from Apr 21, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

proper access to IS_CLIQZ global

  • Loading branch information
christophertino committed Apr 20, 2020
commit 37fd0773773cad14a6af705a8a3357c0fdbca2da
@@ -1,7 +1,7 @@
### GHOSTERY 8.5.0 ()

+ New Spring themes for Plus subscribers (#525)
+ New settings option to select Ad-Blocker lists (#)
+ New settings option to select Ad-Blocker lists (#527)
+ Add password reset link to Intro Hub (#507)
+ Updated in-app promo modals (#509)
+ Fixes bug in site-specific tracker white-listing (#522, Fixes #519)
@@ -20,7 +20,7 @@ import { sendMessage } from '../utils/msg';
import globals from '../../../src/classes/Globals';
import { log } from '../../../src/utils/common';

const IS_CLIQZ = (globals.BROWSER_INFO.name === 'cliqz');
const { IS_CLIQZ } = globals;

/**
* @class The Rewards Panel shows offers generated by Ghostery Rewards.
@@ -14,7 +14,7 @@
import React from 'react';
import globals from '../../../../src/classes/Globals';

const IS_CLIQZ = (globals.BROWSER_INFO.name === 'cliqz');
const { IS_CLIQZ } = globals;

/**
* @class Implement Opt In subview as a React component.
@@ -16,7 +16,7 @@ import { NavLink } from 'react-router-dom';
import ClassNames from 'classnames';
import globals from '../../../../src/classes/Globals';

const IS_CLIQZ = (globals.BROWSER_INFO.name === 'cliqz');
const { IS_CLIQZ } = globals;

/**
* @const Implement left pane of the main Settings view as a
ProTip! Use n and p to navigate between commits in a pull request.