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

GH-2178: Update Anti-suite names where they appear in GBE #614

Closed
wants to merge 16 commits into from
+474 −474
Closed

GH-2178: Update Anti-suite names where they appear in GBE #614

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
14c38c3
Rename anti tracking, ad blocking, smart blocking, ad block and ad bl…
benstrumeyer Oct 1, 2020
7177972
Update snapshot
benstrumeyer Oct 1, 2020
47e19e5
Update smart blocking to smart browsing in a few more places
benstrumeyer Oct 1, 2020
9ce11ae
Update snapshot
benstrumeyer Oct 1, 2020
e9bda62
Merge in develop
wlycdgr Oct 2, 2020
5da56d0
Rename all variables from smartBlock -> smartBrowse, rename PolicySma…
benstrumeyer Oct 6, 2020
c276bf6
Update snapshot
benstrumeyer Oct 6, 2020
b2a3776
Merge in develop
wlycdgr Oct 27, 2020
92133b7
Merge branch 'develop' into GH-2178
benstrumeyer Oct 27, 2020
635b330
Merge branch 'develop' into GH-2178
benstrumeyer Oct 27, 2020
7bfbe2d
Merge branch 'GH-2178' of github.com:ghostery/ghostery-extension into…
benstrumeyer Oct 27, 2020
7d86f5b
Update copy
benstrumeyer Oct 27, 2020
4afc08d
Smart Browsing -> Smart-Browsing, add a dash
benstrumeyer Oct 27, 2020
3bf1cc1
Update CHANGELOG
benstrumeyer Oct 27, 2020
b0d54a8
Update more variables (smartBrowseBlocked/smartBrowseUnblocked)
benstrumeyer Oct 27, 2020
0166d29
Update Smart Blocking -> Smart Blocking in comments
benstrumeyer Oct 27, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Merge in develop

  • Loading branch information
@wlycdgr
wlycdgr committed Oct 27, 2020
commit b2a3776e9b3855ae373b297d8ebc286744fa1214
4 app/hub/Views/SetupView/SetupViewContainer.jsx
View file
Open in desktop
@@ -110,8 +110,8 @@ class SetupViewContainer extends Component {
actions.setAntiTracking({ enable_anti_tracking: true });
actions.setAdBlock({ enable_ad_block: true });
actions.setSmartBrowsing({ enable_smart_browse: true });
actions.setGhosteryRewards({ enable_ghostery_rewards: !IS_FIREFOX && !IS_ANDROID });
actions.setHumanWeb({ enable_human_web: !IS_FIREFOX || BROWSER_INFO.name === 'ghostery_android' });
actions.setGhosteryRewards({ enable_ghostery_rewards: !IS_FIREFOX && !IS_ANDROID && BROWSER_INFO.name !== 'ghostery_desktop' });
actions.setHumanWeb({ enable_human_web: !IS_FIREFOX || BROWSER_INFO.name === 'ghostery_desktop' || BROWSER_INFO.name === 'ghostery_android' });
}

/**
2 src/classes/Metrics.js
View file
Open in desktop
@@ -282,7 +282,7 @@ class Metrics {
// Adblocking state
this._buildQueryPair('ab', conf.enable_ad_block ? '1' : '0') +
// Smartblocking state
`&sm=${encodeURIComponent(conf.enable_smart_browse ? '1' : '0')}` +
this._buildQueryPair('sm', conf.enable_smart_browse ? '1' : '0') +
// Antitracking state
this._buildQueryPair('at', conf.enable_anti_tracking ? '1' : '0') +
// The deepest setup page reached by user during setup
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.