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

v8.4.3 Bug Fixes #446

Merged
merged 8 commits into from Sep 6, 2019
Next

disable overlay search

  • Loading branch information
christophertino committed Sep 4, 2019
commit bf79ee98ae65f2dc66de7846ec9d421a256b8657
@@ -100,17 +100,6 @@
"minimum_opera_version": "45",
"web_accessible_resources": [
"app/images/*",
"dist/css/rewards_styles.css",
"cliqz/dropdown/dropdown.html",
"cliqz/overlay/styles/overlay.css",
"cliqz/freshtab/images/ghostery-tab-search-icon.svg"
],
"commands": {
"toggle-quicksearch": {
"suggested_key": {
"default": "Ctrl+Shift+Space"
},
"description": "Toggle in-page quick search"
}
}
"dist/css/rewards_styles.css"
]
}
@@ -24,7 +24,7 @@
"docs": "jsdoc -c jsdoc.json -d docs -r",
"leet": "node ./tools/leet/leet-en.js",
"leet.reset": "node ./tools/leet/leet-reset.js",
"postinstall": "vendor-copy && bash ./tools/merge-locales.sh"
"postinstall": "vendor-copy"
},
"vendorCopy": [
{
@@ -45,7 +45,7 @@
"@cliqz/adblocker-circumvention": "^1.0.1",
"@cliqz/url-parser": "^1.0.3",
"base64-js": "^1.3.1",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.1-search/browser-core-7.39.1.tgz",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz",
"classnames": "^2.2.5",
"d3": "^5.11.0",
"foundation-sites": "^6.4.4-rc1",
@@ -1209,13 +1209,13 @@ function setupABTest() {
prefs.set('attrackBloomFilter', false);
}
// overlay search AB test
if (abtest.hasTest('overlay_search')) {
cliqz.enableModule('search');
cliqz.enableModule('overlay');
} else {
cliqz.disableModule('search');
cliqz.disableModule('overlay');
}
// if (abtest.hasTest('overlay_search')) {
// cliqz.enableModule('search');
// cliqz.enableModule('overlay');
// } else {
// cliqz.disableModule('search');
// cliqz.disableModule('overlay');
// }
}

/**
@@ -1,11 +1,24 @@
#!/bin/bash
#
# Merge Cliqz language strings into Ghostery _locales
#
# Ghostery Browser Extension
# http://www.ghostery.com/
#
# Copyright 2019 Ghostery, Inc. All rights reserved.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0

for lang in `ls ./cliqz/static/locale`
do
# filter out only language folder
if [ ! -d "./cliqz/static/locale/$lang" ]; then
continue;
fi
# filter out language folders supported by ghostery

# filter out language folders supported by ghostery
if [ ! -d "_locales/$lang" ]; then
continue;
fi
@@ -1473,9 +1473,9 @@ brorand@^1.0.1:
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=

"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.39.1-search/browser-core-7.39.1.tgz":
version "7.39.1"
resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.1-search/browser-core-7.39.1.tgz#bafed4c25ccfba2089b0f933a4bb4a01492daa92"
"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz":
version "7.39.2"
resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz#856122386d236f16bd5ad769c00b00e823c7c749"
dependencies:
"@cliqz-oss/dexie" "^2.0.4"
"@cliqz/adblocker-webextension" "^0.13.2"
ProTip! Use n and p to navigate between commits in a pull request.