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-1790 - Show ad-block icons in detail view tracker list #411

Merged
merged 3 commits into from Jul 17, 2019
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

update website support links

  • Loading branch information
christophertino committed Jul 17, 2019
commit 94019441389873ca10c2d5029c67c6a39b5afe56
@@ -157,7 +157,7 @@ See [CONTRIBUTING](CONTRIBUTING.md) and [CODE OF CONDUCT](CODE-OF-CONDUCT.md)

## Links
+ [Website](https://ghostery.com/)
+ [Support](mailto:support@ghostery.com)
+ [Support](https://ghostery.com/support)
+ [Twitter (@ghostery)](https://twitter.com/ghostery)
+ [Facebook](https://www.facebook.com/ghostery)
+ [Privacy Policy](https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/)
@@ -953,7 +953,7 @@ function onMessageHandler(request, sender, callback) {
if (name === 'account.openSupportPage') {
metrics.ping('priority_support_submit');
const subscriber = account.hasScopesUnverified(['subscriptions:plus']);
const tabUrl = subscriber ? `https://account.${globals.GHOSTERY_DOMAIN}.com/support` : 'https://www.ghostery.com/faqs/';
const tabUrl = subscriber ? `https://account.${globals.GHOSTERY_DOMAIN}.com/support` : 'https://www.ghostery.com/support/';
utils.openNewTab({ url: tabUrl, become_active: true });
return false;
}
@@ -12,6 +12,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

// @namespace BackgroundUtils

import { extend } from 'underscore';
import conf from '../classes/Conf';
import cliqz from '../classes/Cliqz';
@@ -20,6 +22,7 @@ const { adblocker, antitracking } = cliqz.modules;

/**
* Get the totalUnsafeCount of trackers found by Anti-Tracking on this tabId
* @memberOf BackgroundUtils
* @param {int} tabId
* @return {object} totalUnsafeCount
*/
@@ -47,6 +50,7 @@ export function getCliqzAntiTrackingCount(tabId) {

/**
* Get the totalCount of ads found by the Ad Blocker on this tabId
* @memberOf BackgroundUtils
* @param {int} tabId
* @return {object}
*/
@@ -66,6 +70,7 @@ export function getCliqzAdBlockingCount(tabId) {
/**
* Get list of matched bug_ids from Anti-Tracking and Ad-Blocking for this
* tab, along with list of 'other' trackers found that do not match known bug_ids.
* @memberOf BackgroundUtils
* @param {int} tabId
* @return {object}
*/
@@ -83,6 +88,7 @@ export function getCliqzGhosteryBugs(tabId) {
/**
* Send `totalCount` of ads found by Ad Blocker and `totalUnsafeCount`
* found by Anti-Tracking
* @memberOf BackgroundUtils
* @param {int} tabId
* @param {Function} callback
*/
ProTip! Use n and p to navigate between commits in a pull request.