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 1960 Intro Hub Forgot Password #506

Closed
wants to merge 20 commits into from
+3,643 −2,595
Closed

GH 1960 Intro Hub Forgot Password #506

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
51c9195
update npm dependencies and nvm version
christophertino Jan 24, 2020
851235f
GH-1911 Remove edge legacy code (#492)
benstrumeyer Jan 30, 2020
be339da
update changelog
christophertino Jan 30, 2020
e1de727
Update browser-core to v7.43 (#490)
sammacbeth Jan 30, 2020
e3610ea
fix lint errors and clean up yarn.lock
christophertino Jan 30, 2020
4afff29
Fix 'trust site' on localhost (#491)
benstrumeyer Feb 3, 2020
a597881
change manifest applications property to browser_specific_settings
christophertino Feb 3, 2020
02d5bed
update dependencies
christophertino Feb 3, 2020
371fae8
GH-1791 / add locale-appropriate formatting to historical stats numbe…
wlycdgr Feb 13, 2020
cb14abf
GH-1936 & GH-1920 Remove email opt-in from account creation in panel …
benstrumeyer Feb 14, 2020
22c66d6
Disable Purplebox on Firefox Android (#494)
benstrumeyer Feb 14, 2020
eb278c4
update changelog
christophertino Feb 14, 2020
b9186bc
GH-1947 Plus checkout UTM params (#499)
benstrumeyer Feb 21, 2020
a726e87
update translations
christophertino Feb 21, 2020
8b8bb4f
bump browser core
christophertino Feb 25, 2020
79bf18f
GH-1477 Wildcard/Regex Whitelisting (#501)
benstrumeyer Mar 3, 2020
7b6c32e
Enable whitelisting of Unknown Trackers from Ad Block module (#503)
christophertino Mar 3, 2020
0f32e80
Add ForgotPasswordViewto hub. Move related code from panel to shared …
benstrumeyer Mar 5, 2020
7e61aee
Update snapshot
benstrumeyer Mar 5, 2020
aa44a15
Merge branch 'develop' into GH-1960/intro-hub-forgot-password
benstrumeyer Mar 5, 2020
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next
Loading status checks…
update npm dependencies and nvm version
  • Loading branch information
@christophertino
christophertino committed Jan 24, 2020
commit 51c919534ca27f55fd1c441fc843f99f39ed7446
4 .eslintrc.js
View file
Open in desktop
@@ -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],
2 .nvmrc
View file
Open in desktop
@@ -1 +1 @@
lts/carbon
lts/dubnium
4 CHANGELOG.md
View file
Open in desktop
@@ -1,4 +1,6 @@
### GHOSTERY 8.4.6 (December 23, 2019)
### GHOSTERY 8.4.7 (UNRELEASED)

### GHOSTERY 8.4.6 (December 24, 2019)

+ Modularize Rewards code (#462)
+ Updated promo modals for Ghostery Midnight (#485, #486)
2 app/panel/components/Blocking/Tracker.jsx
View file
Open in desktop
@@ -14,7 +14,7 @@
/* eslint react/no-array-index-key: 0 */

import React from 'react';
import ReactSVG from 'react-svg';
import { ReactSVG } from 'react-svg';
import ClassNames from 'classnames';

import globals from '../../../../src/classes/Globals';
2 app/panel/components/BuildingBlocks/NavButton.jsx
View file
Open in desktop
@@ -12,7 +12,7 @@
*/

import React from 'react';
import ReactSVG from 'react-svg';
import { ReactSVG } from 'react-svg';
import { NavLink } from 'react-router-dom';

/**
2 app/panel/components/Header.jsx
View file
Open in desktop
@@ -13,7 +13,7 @@

import React from 'react';
import { Link } from 'react-router-dom';
import ReactSVG from 'react-svg';
import { ReactSVG } from 'react-svg';
import ClassNames from 'classnames';
import Tooltip from './Tooltip';
import HeaderMenu from './HeaderMenu';
2 app/panel/components/StatsView.jsx
View file
Open in desktop
@@ -13,7 +13,7 @@

import React from 'react';
import ClassNames from 'classnames';
import ReactSVG from 'react-svg';
import { ReactSVG } from 'react-svg';

import StatsGraph from './BuildingBlocks/StatsGraph';
import I18nWithLink from '../../shared-components/I18nWithLink';
2 app/panel/components/Summary.jsx
View file
Open in desktop
@@ -12,7 +12,7 @@
*/

import React from 'react';
import ReactSVG from 'react-svg';
import { ReactSVG } from 'react-svg';
import ClassNames from 'classnames';
import Tooltip from './Tooltip';
import { DynamicUIPortContext } from '../contexts/DynamicUIPortContext';
8 manifest.json
View file
Open in desktop
@@ -9,10 +9,12 @@
"author": "Ghostery",
"name": "__MSG_name__",
"short_name": "Ghostery",
"version": "8.4.6",
"version_name": "8.4.6",
"version": "8.4.7",
"version_name": "8.4.7",
"default_locale": "en",
"description": "__MSG_short_description__",
"debug": true,
"log": true,
"icons": {
"16": "app/images/icon16.png",
"48": "app/images/icon48.png",
@@ -103,4 +105,4 @@
"cliqz/offers-reminder/index.html",
"cliqz/popup-notification/images/*"
]
}
}
76 package.json
View file
Open in desktop
@@ -42,75 +42,75 @@
},
"homepage": "https://github.com/ghostery/ghostery-extension#readme",
"dependencies": {
"@cliqz/adblocker-circumvention": "^1.3.1",
"@cliqz/url-parser": "^1.0.4",
"@cliqz/adblocker-circumvention": "^1.5.0",
"@cliqz/url-parser": "^1.1.1",
"base64-js": "^1.3.1",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.40.2/browser-core-7.40.2.tgz",
"classnames": "^2.2.5",
"d3": "^5.12.0",
"foundation-sites": "^6.4.4-rc1",
"d3": "^5.15.0",
"foundation-sites": "^6.6.1",
"history": "^4.10.1",
"json-api-normalizer": "^0.4.16",
"moment": "^2.19.1",
"prop-types": "^15.6.2",
"query-string": "^6.8.3",
"react": "^16.10.1",
"react-dom": "^16.10.1",
"react-markdown": "^4.2.2",
"react-redux": "^7.1.1",
"query-string": "^6.10.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-markdown": "^4.3.1",
"react-redux": "^7.1.3",
"react-router-dom": "^5.1.2",
"react-svg": "^10.0.22",
"redux": "^4.0.4",
"react-svg": "^11.0.7",
"redux": "^4.0.5",
"redux-object": "^0.5.10",
"redux-thunk": "^2.2.0",
"rsvp": "^4.8.5",
"spanan": "^2.0.0",
"ua-parser-js": "^0.7.20",
"underscore": "^1.8.3",
"ua-parser-js": "^0.7.21",
"underscore": "^1.9.2",
"whatwg-fetch": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.6.2",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.6.2",
"@babel/core": "^7.8.3",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.8.3",
"@babel/preset-react": "^7.8.3",
"@babel/register": "^7.8.3",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"cross-env": "^6.0.3",
"css-loader": "^3.2.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"eslint": "^6.5.1",
"css-loader": "^3.4.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-loader": "^3.0.2",
"eslint-plugin-import": "^2.18.2",
"eslint-loader": "^3.0.3",
"eslint-plugin-import": "^2.20.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.15.1",
"eslint-plugin-react": "^7.18.0",
"fs-extra": "^8.1.0",
"jest": "^24.9.0",
"jest": "^25.1.0",
"jsdoc": "^3.6.3",
"jsonfile": "^5.0.0",
"license-checker": "^25.0.1",
"mini-css-extract-plugin": "^0.8.0",
"node-sass": "^4.12.0",
"oboe": "^2.1.3",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"oboe": "^2.1.5",
"path": "^0.12.7",
"react-router": "^5.1.2",
"react-test-renderer": "^16.10.1",
"redux-mock-store": "^1.5.1",
"sass-loader": "^8.0.0",
"react-test-renderer": "^16.12.0",
"redux-mock-store": "^1.5.4",
"sass-loader": "^8.0.2",
"seamless-immutable": "^7.1.3",
"sinon": "^7.5.0",
"sinon": "^8.1.1",
"sinon-chrome": "^3.0.1",
"svg-url-loader": "^3.0.2",
"svg-url-loader": "^3.0.3",
"underscore-template-loader": "^1.0.0",
"url-loader": "^2.1.0",
"url-loader": "^3.0.0",
"vendor-copy": "^2.0.0",
"webpack": "^4.41.0",
"webpack-cli": "^3.3.9",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-shell-plugin": "^0.5.0"
}
}
ProTip! Use n and p to navigate between commits in a pull request.