GH-2097 bugfix: make sure alternate view displays when expected

.travis.yml

@@ -1,10 +1,7 @@
 language: node_js
 node_js:
   - "lts/dubnium"
-sudo: false
-
-cache:
-  yarn: true
+cache: yarn
 
 install:
   - yarn install --frozen-lockfile

CHANGELOG.md

@@ -1,3 +1,17 @@
+### GHOSTERY 8.5.3 ()
+
++ Updated Firefox Android extension panel UI and mobile optimizations (#587)
++ New console debugging interface for user troubleshooting (#568)
++ Display error message after too many failed login attempts (#577)
++ Add opt-out for AB Tests (#608)
++ Added product id parameter to extension pings (#574)
++ Detect Ghostery Desktop Browser (#602)
++ Remove broken page pings (#609)
++ On-boarding AB Tests (#603)
++ Updated translations
+
+See the complete GitHub [milestone](https://github.com/ghostery/ghostery-extension/milestone/14?closed=1)
+
 ### GHOSTERY 8.5.2 (July 30, 2020)
 
 + Fixes bug where Ghostery icon could be grayed out on restricted sites (#564)

CODEOWNERS

@@ -3,23 +3,23 @@
 # the last matching pattern has the most precedence.
 
 # Core Ghostery team
-*       @ghostery/ghostery
+*       @ghostery/extension
 
 # CMP / Metrics / WebRequest
-/src/classes/ABTest.js @jsignanini
-/src/classes/CMP.js @jsignanini
-/src/classes/EventHandlers.js @jsignanini
-/src/classes/Metrics.js @jsignanini
-/src/classes/PolicySmartBlock.js @jsignanini
-/src/classes/Conf.js @zarembsky
-/src/classes/ConfData.js @zarembsky
+/src/classes/ABTest.js @wlycdgr
+/src/classes/CMP.js @christophertino
+/src/classes/EventHandlers.js @christophertino
+/src/classes/Metrics.js @wlycdgr
+/src/classes/PolicySmartBlock.js @christophertino
+/src/classes/Conf.js @christophertino
+/src/classes/ConfData.js @christophertino
 /src/classes/PanelData.js @wlycdgr
 
 # Background
-/src/background.js @zarembsky
+/src/background.js @christophertino
 
 # The Ghostery Hub
-/app/hub/ @Eden12345
+/app/hub/ @benstrumeyer
 
 # Shared Components
 /app/shared-components @wlycdgr
@@ -30,4 +30,4 @@ babel.config.js @christophertino
 webpack.config.js @christophertino
 
 # Unit Tests
-/test/ @Eden12345
+/test/ @christophertino

README.md

@@ -1,7 +1,7 @@
 [![Ghostery](https://www.ghostery.com/wp-content/themes/ghostery/images/ghostery_logo_black.svg)](https://www.ghostery.com)
 ---
 
-[![Build Status](https://travis-ci.org/ghostery/ghostery-extension.svg?branch=master)](https://travis-ci.org/ghostery/ghostery-extension)   ![GitHub manifest version](https://img.shields.io/github/manifest-json/v/ghostery/ghostery-extension.svg?style=flat-square)   [![Chat on Gitter](https://img.shields.io/gitter/room/ghostery/ghostery-expenstion.svg?style=flat-square)](https://gitter.im/ghostery/ghostery-extension)   [![Twitter Follow](https://img.shields.io/twitter/follow/ghostery.svg?style=social&maxAge=3600)](https://twitter.com/ghostery)
+[![Build Status](https://travis-ci.com/ghostery/ghostery-extension.svg?branch=master)](https://travis-ci.com/ghostery/ghostery-extension)   ![GitHub manifest version](https://img.shields.io/github/manifest-json/v/ghostery/ghostery-extension.svg?style=flat-square)   [![Twitter Follow](https://img.shields.io/twitter/follow/ghostery.svg?style=social&maxAge=3600)](https://twitter.com/ghostery)
 
 Ghostery helps you browse smarter by giving you control over ads and tracking technologies to speed up page loads, eliminate clutter, and protect your data. This is the unified code repository for the Ghostery browser extensions in Chrome, Firefox, Opera and Edge.
 
@@ -51,7 +51,6 @@ $ yarn build.watch
 ```javascript
 // In manifest.json set
 "debug": true,
-"log": true,
 ```
 
 ## Testing and Linting
@@ -115,7 +114,7 @@ $ node tools/transifex.js
 ```
 
 ## Cliqz Source Code
-Ghostery implements the following open-source products from [Cliqz](https://cliqz.com/en/)
+Ghostery implements the following open-source products from Cliqz:
 
 [**Human Web**](https://cliqz.com/en/whycliqz/human-web)
 + [How it works](https://cliqz.com/en/magazine/techblog-human-web-reliably-removes-uids)
@@ -161,7 +160,8 @@ See [CONTRIBUTING](CONTRIBUTING.md) and [CODE OF CONDUCT](CODE-OF-CONDUCT.md)
 ## Additional Open Source Ghostery Projects
 + [Ghostery Lite for Safari](https://github.com/ghostery/GhosterySafari)
 + [Ghostery iOS Browser](https://github.com/ghostery/user-agent-ios)
-+ [Ghostery Android Browser](https://github.com/ghostery/browser-android)
++ [Ghostery Android Browser](https://github.com/ghostery/user-agent-android)
++ [Ghostery Desktop Browser](https://github.com/ghostery/user-agent-desktop)
 
 ## Ghostery Team
 Ghostery relies on [contributions](https://github.com/ghostery/ghostery-extension/graphs/contributors) from lots of talented people.

_locales/de/messages.json

@@ -833,6 +833,9 @@
 	"settings_account": {
 		"message": "Konto"
 	},
+	"settings_import_export": {
+		"message": "Einstellungen importieren und exportieren"
+	},
 	"settings_trackers": {
 		"message": "Tracker"
 	},
@@ -944,6 +947,9 @@
 	"settings_allow_offers": {
 		"message": "Teilnahme an Ghostery Rewards"
 	},
+  	"settings_allow_abtests": {
+	  	"message": "Teilnahme an A/B-Tests"
+	},
 	"settings_signin_create_header": {
 		"message": "Anmelden/Konto erstellen"
 	},
@@ -1034,6 +1040,9 @@
 	"settings_offers_tooltip": {
 		"message": "Ghostery Rewards ist eine Private-by-Design-Funktion, die Ihnen beim Browsen Rabatte und Sonderangebote unserer Partnerunternehmen liefert."
 	},
+  	"settings_abtests_tooltip": {
+	  	"message": "Die Teilnahme an randomisierten A/B-Tests hilft Ghostery zu verstehen, welche Version eines neuen Layouts oder einer neuen Funktion Benutzer wie Sie bevorzugen."
+	},
 	"settings_opt_in": {
 		"message": "Opt-in/-out"
 	},
@@ -1234,6 +1243,48 @@
 			}
 		}
 	},
+	"android_tab_overview": {
+		"message": "Übersicht"
+	},
+	"android_tab_site_blocking": {
+		"message": "Blockieren von Websites"
+	},
+	"android_tab_global_blocking": {
+		"message": "Global blockieren"
+	},
+	"android_site_blocking_header": {
+		"message": "Tracker auf dieser Website"
+	},
+	"android_global_blocking_header": {
+		"message": "Globales Tracking"
+	},
+	"android_blocking_reset": {
+		"message": "Einstellungen zurücksetzen"
+	},
+	"android_block": {
+		"message": "Blockieren"
+	},
+	"android_unblock": {
+		"message": "Nicht Blockieren"
+	},
+	"android_restrict": {
+		"message": "Einschränken"
+	},
+	"android_unrestrict": {
+		"message": "Rückgängig machen"
+	},
+	"android_trust": {
+		"message": "Vertrauen"
+	},
+	"android_untrust": {
+		"message": "Rückgängig machen"
+	},
+	"android_anonymize": {
+		"message": "Anonymisieren"
+	},
+	"android_anonymized": {
+		"message": "Anonymisiert"
+	},
 	"hub_side_navigation_home": {
 		"message": "Startseite"
 	},
@@ -1306,6 +1357,9 @@
 	"hub_home_plus_full_protection": {
 		"message": "Sie sind umfassend geschützt!"
 	},
+	"hub_upgrade_page_title": {
+		"message": "Ghostery Hub - Upgrade-Plan"
+	},
 	"hub_upgrade_your": {
 		"message": "Upgrade für Ihren"
 	},
@@ -1684,7 +1738,7 @@
 		"message": "Lösen Sie Probleme schneller mit unserem Priority Helpdesk-Service – und weitere Vorteile"
 	},
 	"hub_supporter_manifesto": {
-		"message": "Wir versuchen, unseren Nutzern kostenlos die besten Dienstleistungen zum Schutz der Privatsphäre zu bieten. Wir verlangen keine Gebühr für unsere Browser-Erweiterung, aber Sie können uns durch ein kleines monatliches Abonnement unterstützen. Stufen Sie Ihre Version auf Ghostery Plus hoch - es erwarten Sie tolle Vorteile."
+		"message": "Wir sind bestrebt, unseren Nutzern kostenlos die besten Dienstleistungen zum Schutz der Privatsphäre zur Verfügung zu stellen. Wir verlangen keine Gebühr für unsere Browser-Erweiterung, aber Sie können uns mit einem monatlichen Abonnement in Höhe von 4,99 Dollar unterstützen. Stufen Sie Ihre Version auf Ghostery Plus hoch - es erwarten Sie tolle Vorteile."
 	},
 	"hub_supporter_feature_theme_description": {
 		"message": "Passen Sie die Ghostery-Farben für eine neue visuelle Erfahrung an! Eingeführt auf vielfachen Wunsch. Sehen Sie sich unser spezielles dunkelblaues Thema an. Weitere Themen folgen noch."
@@ -1899,7 +1953,7 @@
 		"message": "Themes"
 	},
 	"subscribe_pitch": {
-		"message": "Ghostery ist kostenlos, aber Sie können uns durch ein kleines monatliches Abonnement unterstützen. Als Gegenleistung erhalten Sie besondere Vorteile wie bunte Themes, persönliche Tracking-Statistiken und mehr. Kaufen Sie jetzt ein Abonnement."
+		"message": "Wir verlangen keine Gebühr für unsere Browser-Erweiterung, aber Sie können uns mit einem monatlichen Abonnement in Höhe von 4,99 Dollar unterstützen. Dafür erhalten Sie besondere Vorteile wie bunte Themes, persönliche Tracking-Statistiken und mehr. Kaufen Sie jetzt ein Abonnement."
 	},
 	"subscribe_pitch_spring": {
 		"message": "Gefällt Ihnen, was wir tun? Unterstützen Sie uns und schalten Sie durch ein Upgrade auf Ghostery Plus neue Frühlingsthemen, persönliche Tracking-Informationen und weitere besondere Vergünstigungen frei!"
@@ -2499,5 +2553,8 @@
 	},
 	"too_many_password_resets_text": {
 		"message": "Zu viele Anforderungen zur Passwortzurücksetzung gesendet. Versuchen Sie es in einer Stunde erneut."
+	},
+	"too_many_failed_logins_text": {
+		"message": "Zu viele fehlgeschlagene Anmeldeversuche. Versuchen Sie es in einer Stunde erneut."
 	}
 }

_locales/en/messages.json

@@ -833,6 +833,9 @@
 	"settings_account": {
 		"message": "Account"
 	},
+	"settings_import_export": {
+		"message": "Import & Export Settings"
+	},
 	"settings_trackers": {
 		"message": "Trackers"
 	},
@@ -944,6 +947,9 @@
 	"settings_allow_offers": {
 		"message": "Participating in Ghostery Rewards"
 	},
+  	"settings_allow_abtests": {
+	  	"message": "Participating in A/B Tests"
+	},
 	"settings_signin_create_header": {
 		"message": "Sign In / Create Account"
 	},
@@ -1034,6 +1040,9 @@
 	"settings_offers_tooltip": {
 		"message": "Ghostery Rewards is a private-by-design feature that delivers you discounts and special offers from our partner companies as you browse."
 	},
+  	"settings_abtests_tooltip": {
+	  	"message": "Participating in randomized A/B tests helps Ghostery understand which version of a new layout or feature users like you prefer."
+	},
 	"settings_opt_in": {
 		"message": "Opt In / Out"
 	},
@@ -1234,6 +1243,48 @@
 			}
 		}
 	},
+	"android_tab_overview": {
+		"message": "Overview"
+	},
+	"android_tab_site_blocking": {
+		"message": "Site Blocking"
+	},
+	"android_tab_global_blocking": {
+		"message": "Global Blocking"
+	},
+	"android_site_blocking_header": {
+		"message": "Trackers on this site"
+	},
+	"android_global_blocking_header": {
+		"message": "Global Tracking"
+	},
+	"android_blocking_reset": {
+		"message": "Reset Settings"
+	},
+	"android_block": {
+		"message": "Block"
+	},
+	"android_unblock": {
+		"message": "Unblock"
+	},
+	"android_restrict": {
+		"message": "Restrict"
+	},
+	"android_unrestrict": {
+		"message": "Undo"
+	},
+	"android_trust": {
+		"message": "Trust"
+	},
+	"android_untrust": {
+		"message": "Undo"
+	},
+	"android_anonymize": {
+		"message": "Anonymize"
+	},
+	"android_anonymized": {
+		"message": "Anonymized"
+	},
 	"hub_side_navigation_home": {
 		"message": "Home"
 	},
@@ -1306,6 +1357,9 @@
 	"hub_home_plus_full_protection": {
 		"message": "You are fully protected!"
 	},
+	"hub_upgrade_page_title": {
+		"message": "Ghostery Hub - Upgrade Plan"
+	},
 	"hub_upgrade_your": {
 		"message": "Upgrade your"
 	},
@@ -1684,7 +1738,7 @@
 		"message": "Resolve issues fast with our Priority help desk service - and more perks to come"
 	},
 	"hub_supporter_manifesto": {
-		"message": "We strive to deliver the best privacy protection services to our users free of cost. While we do not charge for our browser extension, you may choose to support us through a small monthly subscription. Join us in our mission by upgrading to Ghostery Plus - and unlock cool perks along the way!"
+		"message": "We strive to deliver the best privacy protection services to our users free of cost. While we do not charge for our browser extension, you may choose to support us through a monthly subscription of $4.99. Join us in our mission by upgrading to Ghostery Plus - and unlock cool perks along the way!"
 	},
 	"hub_supporter_feature_theme_description": {
 		"message": "Customize the Ghostery colors for a new visual experience! Introduced through popular request. Check out our special Dark Blue theme, and more to come."
@@ -1899,7 +1953,7 @@
 		"message": "Themes"
 	},
 	"subscribe_pitch": {
-		"message": "While Ghostery is free, you can choose to support us through a small monthly subscription in exchange for special perks like color themes, personal tracking statistics, and more. Join our mission and subscribe!"
+		"message": "While Ghostery is free, you can choose to support us through a monthly subscription of $4.99 in exchange for special perks, like color themes, personal tracking statistics, and more. Join our mission and subscribe!"
 	},
 	"subscribe_pitch_spring": {
 		"message": "Like what we do? Support us and unlock new spring themes, personal tracking insights, and other special perks by upgrading to Ghostery Plus!"
@@ -2468,7 +2522,7 @@
 		"message": "Try Ghostery Midnight"
 	},
 	"seven_day_free_trial": {
-		"message": "7 Day Free Trial"
+		"message": "7-day free trial"
 	},
 	"spring_is_here": {
 		"message": "Spring is here!"
@@ -2499,5 +2553,8 @@
 	},
 	"too_many_password_resets_text": {
 		"message": "Too many password reset requests. Try again in one hour."
+	},
+	"too_many_failed_logins_text": {
+		"message": "Too many failed logins. Try again in one hour."
 	}
 }