GH 1960 Intro Hub Forgot Password

.eslintrc.js

@@ -48,7 +48,8 @@ module.exports = {
 		}],
 		'func-names': [0],
 		'indent': [1, 'tab', {
-			'SwitchCase': 1
+			'SwitchCase': 1,
+			'ignoredNodes': ['TemplateLiteral']
 		}],
 		'lines-between-class-members': [1],
 		'max-len': [0],
@@ -66,6 +67,7 @@ module.exports = {
 		'operator-linebreak': [0],
 		'prefer-object-spread': [0], // TODO: enable this check
 		'space-before-function-paren': [2, 'never'],
+		'template-curly-spacing': [0],
 
 		// Plugin: Import
 		'import/no-cycle': [0],

.nvmrc

@@ -1 +1 @@
-lts/carbon
+lts/dubnium

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "lts/carbon"
+  - "lts/dubnium"
 sudo: false
 
 cache:

CHANGELOG.md

@@ -1,4 +1,15 @@
-### GHOSTERY 8.4.6 (December 23, 2019)
+### GHOSTERY 8.4.7 (UNRELEASED)
+
++ Migrate to the new Chromium-based Edge browser (#492)
++ Disable Purplebox on Firefox Android (#494)
++ Allow white-listing of wildcard domains (#501)
++ Allow site-specific white-listing of Unknown Trackers caught by Ad-Blocker (#503)
++ Fixes issue when adding localhost to Trusted Sites with port value (Fixes #470)
++ Add locale-appropriate formatting to historical stats numbers (#498)
++ Remove email opt-in from account creation in panel and hub (#495)
++ More aggressive cookie-blocking via Anti-Tracking (#490)
+
+### GHOSTERY 8.4.6 (December 24, 2019)
 
 + Modularize Rewards code (#462)
 + Updated promo modals for Ghostery Midnight (#485, #486)

README.md

@@ -12,7 +12,7 @@ Ghostery helps you browse smarter by giving you control over ads and tracking te
 
 **Opera** – [Download](https://addons.opera.com/en/extensions/details/ghostery/)
 
-**Edge** – [Download](https://www.microsoft.com/en-us/store/p/ghostery/9nblggh52ngz)
+**Edge** – [Download](https://microsoftedge.microsoft.com/addons/detail/fclbdkbhjlgkbpfldjodgjncejkkjcme)
 
 ## Installation
 
@@ -145,7 +145,7 @@ $ ./fern.js build configs/ghostery.js --environment=production --no-debug
 + Firefox Android: 55+
 + Chrome: 58+
 + Opera: 45+
-+ Edge: 34.14291+
++ Edge: 79+
 
 ## Contribute
 

_locales/de/messages.json

@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "Die Funktion ist im Cliqz MyOffrz-Bedienfeld bereits aktiv."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "Ghostery Rewards werden in Edge-Browser nicht unterstützt."
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Rewards werden geladen..."
 	},
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "Verwenden Sie zwischen 8 und 50 Zeichen."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Schicken Sie mir Ghostery-Aktualisierungen & Promotions."
-	},
 	"hub_create_account_already_have_account": {
 		"message": "Sie haben bereits ein Ghostery-Konto?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},
@@ -2353,8 +2347,7 @@
 	  "message": "Testen Sie Ghostery Midnight"
 	},
   	"seven_day_free_trial": {
-	  "message": "7 Tage kostenlose Testversion (&#36;14/mtl.)",
-	  "description": "Do not localize currency. Use the $14 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "7 Tage kostenlose Testversion (&#36;14/mtl.)"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Holen Sie sich umfassenden Schutz für alle Browser und Apps auf Ihrem Gerät."
@@ -2375,8 +2368,7 @@
 	  "message": "Kostenlos herunterladen"
 	},
   	"support_ghostery_for_2_instead": {
-	  "message": "Unterstützen Sie Ghostery stattdessen für &#36;2/mtl.",
-	  "description": "Do not localize currency. Use the $2 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Unterstützen Sie Ghostery stattdessen für &#36;2/mtl."
 	},
   	"no_thanks_continue_with_basic": {
 	  "message": "Nein, danke. Mit Basisversion fortfahren."

_locales/en/messages.json

@@ -505,7 +505,7 @@
 			}
 		}
 	},
-	"panel_forgot_password": {
+	"forgot_password": {
 		"message": "Forgot Password?"
 	},
 	"panel_help_panel_header": {
@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "Feature already active in the Cliqz MyOffrz control panel."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "Ghostery Rewards is not currently supported in Microsoft Edge."
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Loading Rewards..."
 	},
@@ -805,7 +802,7 @@
 		"message": "unblocked"
 	},
 	"white_black_list_error_invalid_url": {
-		"message": "Please enter a valid URL."
+		"message": "Please enter a valid URL or wildcard."
 	},
 	"whitelist_error_blacklist_url": {
 		"message": "This site has been removed from your Restricted Sites list and added to your Trusted Sites list."
@@ -1061,7 +1058,7 @@
 		"message": "Trusted Sites"
 	},
 	"settings_sites_placeholder": {
-		"message": "example.com"
+		"message": "example.com (wildcards supported)"
 	},
 	"settings_restricted_sites": {
 		"message": "Restricted Sites"
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "Use between 8 and 50 characters."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Send me Ghostery updates & promotions."
-	},
 	"hub_create_account_already_have_account": {
 		"message": "Already have a Ghostery Account?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},

_locales/es/messages.json

@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "Función ya activa en el panel de control de Cliqz MyOffrz."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "Ghostery Rewards no se admite en el navegador Edge"
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Cargando Rewards..."
 	},
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "Usa entre 8 y 50 caracteres."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Envíame actualizaciones y promociones de Ghostery."
-	},
 	"hub_create_account_already_have_account": {
 		"message": "¿Ya tienes una cuenta de Ghostery?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},
@@ -2353,8 +2347,7 @@
 	  "message": "Prueba Ghostery Midnight"
 	},
   	"seven_day_free_trial": {
-	  "message": "Prueba gratuita de 7 días (&#36;14/mes)",
-	  "description": "Do not localize currency. Use the $14 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Prueba gratuita de 7 días (&#36;14/mes)"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Obtén protección de cobertura completa en todos los navegadores y aplicaciones de tu dispositivo"
@@ -2375,8 +2368,7 @@
 	  "message": "Descarga gratuita"
 	},
   	"support_ghostery_for_2_instead": {
-	  "message": "O apoya a Ghostery por &#36;2/mes",
-	  "description": "Do not localize currency. Use the $2 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "O apoya a Ghostery por &#36;2/mes"
 	},
   	"no_thanks_continue_with_basic": {
 	  "message": "No, gracias, continuar con básico"

_locales/fr/messages.json

@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "Fonction déjà activée dans le panneau de commande Cliqz MyOffrz."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "Ghostery Rewards n'est pas pris en charge par le navigateur Edge"
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Chargement des Rewards…"
 	},
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "Utilisez entre 8 et 50 caractères."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Envoyez-moi les mises à jour & promotions Ghostery."
-	},
 	"hub_create_account_already_have_account": {
 		"message": "Vous avez déjà un compte Ghostery ?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},
@@ -2353,8 +2347,7 @@
 	  "message": "Essayez Ghostery Midnight"
 	},
   	"seven_day_free_trial": {
-	  "message": "Essai gratuit de 7 jours (14 &#36;/mois)",
-	  "description": "Do not localize currency. Use the $14 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Essai gratuit de 7 jours (14 &#36;/mois)"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Bénéficiez d'une protection complète sur tous les navigateurs et toutes les applications sur votre appareil"
@@ -2375,8 +2368,7 @@
 	  "message": "Télécharger gratuitement"
 	},
   	"support_ghostery_for_2_instead": {
-	  "message": "Aidez Ghostery pour 2 &#36;/mois",
-	  "description": "Do not localize currency. Use the $2 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Aidez Ghostery pour 2 &#36;/mois"
 	},
   	"no_thanks_continue_with_basic": {
 	  "message": "Non merci, continuer avec la version de base"

_locales/hu/messages.json

@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "A funkció már aktív a Cliqz MyOffrz vezérlőpultjában."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "A Ghostery Rewards nem támogatott az Edge böngészőben"
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Rewards betöltése…"
 	},
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "8–50 karaktert használjon."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Küldjenek nekem friss Ghostery híreket és promóciókat!"
-	},
 	"hub_create_account_already_have_account": {
 		"message": "Már van Ghostery fiókja?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},
@@ -2353,8 +2347,7 @@
 	  "message": "Próbálja ki a Ghostery Midnight-t"
 	},
   	"seven_day_free_trial": {
-	  "message": "7 napos ingyenes próbaverzió (&#36; 14/hó)",
-	  "description": "Do not localize currency. Use the $14 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "7 napos ingyenes próbaverzió (&#36; 14/hó)"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Teljes védelmet élvezhet az eszköz összes böngészőjével és alkalmazásával"
@@ -2375,8 +2368,7 @@
 	  "message": "Töltse le ingyen"
 	},
   	"support_ghostery_for_2_instead": {
-	  "message": "Ehelyett támogassa a Ghostery-t &#36; 2 / hónap alatt",
-	  "description": "Do not localize currency. Use the $2 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Ehelyett támogassa a Ghostery-t &#36; 2 / hónap alatt"
 	},
   	"no_thanks_continue_with_basic": {
 	  "message": "Nem, köszönöm, folytassa az alapszinttel"

_locales/it/messages.json

@@ -727,9 +727,6 @@
 	"panel_detail_rewards_cliqz_text": {
 		"message": "La funzione è già attiva nel pannello di controllo Cliqz MyOffrz."
 	},
-	"panel_detail_rewards_edge_text": {
-		"message": "Il browser Edge non supporta Ghostery Rewards"
-	},
 	"panel_detail_rewards_loading": {
 		"message": "Caricamento Rewards in corso…"
 	},
@@ -1649,9 +1646,6 @@
 	"hub_create_account_label_password_invalid_length": {
 		"message": "Utilizza tra 8 e 50 caratteri."
 	},
-	"hub_create_account_checkbox_promotions": {
-		"message": "Inviatemi aggiornamenti e promozioni su Ghostery"
-	},
 	"hub_create_account_already_have_account": {
 		"message": "Hai già un Account Ghostery?"
 	},
@@ -1942,7 +1936,7 @@
 				"content": "</a>"
 			},
 			"link_start": {
-				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus/\">"
+				"content": "<br><a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://www.ghostery.com/products/plus?utm_source=gbe&utm_campaign=in_app_hstats_lm\">"
 			}
 		}
 	},
@@ -2353,8 +2347,7 @@
 	  "message": "Prova Ghostery Midnight"
 	},
   	"seven_day_free_trial": {
-	  "message": "Prova gratuita di 7 giorni (&#36;14/mese)",
-	  "description": "Do not localize currency. Use the $14 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Prova gratuita di 7 giorni (&#36;14/mese)"
 	},
   	"full_coverage_protection_promise": {
 	  "message": "Ottieni la protezione completa per tutti i browser e le app sul tuo dispositivo"
@@ -2375,8 +2368,7 @@
 	  "message": "Scarica gratis"
 	},
   	"support_ghostery_for_2_instead": {
-	  "message": "Sostieni Ghostery al costo di &#36;2/mese",
-	  "description": "Do not localize currency. Use the $2 USD amount. The second $ is needed to escape the special meaning of $"
+	  "message": "Sostieni Ghostery al costo di &#36;2/mese"
 	},
   	"no_thanks_continue_with_basic": {
 	  "message": "No, grazie. Continuo con la versione base"