Skip to content

Commit

Permalink
Merge branch 'development' into fix/power-pax-tier1
Browse files Browse the repository at this point in the history
  • Loading branch information
schnogz committed May 8, 2019
2 parents 703da82 + b34c857 commit 78da4be
Show file tree
Hide file tree
Showing 26 changed files with 5,512 additions and 392 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@
"onetime": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
},
"devDependencies": {
"@babel/cli": "7.2.3",
"@babel/core": "7.2.2",
"@babel/cli": "7.4.4",
"@babel/core": "7.4.4",
"@babel/node": "7.2.2",
"@babel/polyfill": "7.2.5",
"@babel/plugin-proposal-class-properties": "7.4.4",
"@babel/plugin-proposal-object-rest-spread": "7.4.4",
"@babel/polyfill": "7.4.4",
"@babel/preset-env": "7.4.4",
"@babel/preset-react": "7.0.0",
"@babel/plugin-proposal-class-properties": "7.3.0",
"@babel/plugin-proposal-object-rest-spread": "7.3.1",
"@babel/preset-env": "7.3.1",
"@storybook/addon-actions": "4.1.9",
"@storybook/addon-info": "4.1.9",
"@storybook/addon-links": "4.1.9",
Expand All @@ -132,20 +132,20 @@
"babel-istanbul": "0.12.2",
"babel-jest": "23.6.0",
"babel-loader": "8.0.5",
"babel-plugin-inline-react-svg": "1.0.1",
"babel-plugin-module-resolver": "3.1.3",
"babel-plugin-inline-react-svg": "1.1.0",
"babel-plugin-module-resolver": "3.2.0",
"babel-plugin-react-html-attrs": "2.1.0",
"babel-plugin-react-intl": "3.0.1",
"babel-plugin-styled-components": "1.10.0",
"bs58": "4.0.1",
"case-sensitive-paths-webpack-plugin": "2.1.2",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"chalk": "2.4.2",
"clean-webpack-plugin": "1.0.1",
"copy-webpack-plugin": "4.6.0",
"commitizen": "3.0.5",
"coveralls": "3.0.2",
"cross-env": "5.2.0",
"css-loader": "1.0.1",
"css-loader": "2.1.1",
"cz-conventional-changelog": "2.1.0",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.7.1",
Expand Down Expand Up @@ -188,12 +188,12 @@
"staged-git-files": "1.1.2",
"standard": "12.0.1",
"style-loader": "0.23.1",
"thread-loader": "2.1.1",
"uglifyjs-webpack-plugin": "2.1.1",
"webpack": "4.29.0",
"webpack-bundle-analyzer": "3.0.3",
"webpack-cli": "3.2.1",
"webpack-dev-server": "3.1.14",
"thread-loader": "2.1.2",
"uglifyjs-webpack-plugin": "2.1.2",
"webpack": "4.30.0",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.2",
"webpack-dev-server": "3.3.1",
"wsrun": "2.2.1"
}
}
226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/cs.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/de.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/es.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/fr.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/id.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/it.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/ja.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/ko.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/ms.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/nl.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/pl.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/pt.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/ro.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/ru.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/sv.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/th.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/tr.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/uk.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/vi.json

Large diffs are not rendered by default.

226 changes: 223 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/assets/locales/zh.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import styled from 'styled-components'

import ActivityLogging from './ActivityLogging'
import APIAccess from './APIAccess'
import IPWhitelist from './IPWhitelist'
import LoginIpRestriction from './LoginIpRestriction'
Expand All @@ -23,7 +22,6 @@ export default class AdvancedSecurity extends React.PureComponent {
<WalletPassword />
<SecondPasswordWallet />
<TwoStepVerificationRemember />
<ActivityLogging />
<IPWhitelist />
<LoginIpRestriction />
<WalletAccessTor />
Expand Down
10 changes: 2 additions & 8 deletions packages/blockchain-wallet-v4-frontend/webpack.config.ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
.BundleAnalyzerPlugin
const CleanWebpackPlugin = require('clean-webpack-plugin')
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
const Webpack = require('webpack')
Expand Down Expand Up @@ -71,7 +70,6 @@ module.exports = {
},
plugins: [
new CleanWebpackPlugin([PATHS.ciBuild], { allowExternal: true }),
new CaseSensitivePathsPlugin(),
new Webpack.DefinePlugin({
APP_VERSION: JSON.stringify(require(PATHS.pkgJson).version),
NETWORK_TYPE: JSON.stringify(envConfig.NETWORK_TYPE)
Expand All @@ -89,18 +87,14 @@ module.exports = {
uglifyOptions: {
warnings: false,
compress: {
warnings: false,
keep_fnames: true
},
mangle: {
keep_fnames: true
},
nameCache: null,
toplevel: false,
ie8: false
}
},
parallel: true,
cache: true
cache: false
})
],
concatenateModules: true,
Expand Down
5 changes: 1 addition & 4 deletions packages/blockchain-wallet-v4-frontend/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,7 @@ module.exports = {
},
mangle: {
keep_fnames: true
},
nameCache: null,
toplevel: false,
ie8: false
}
},
parallel: true,
cache: true
Expand Down
5 changes: 1 addition & 4 deletions packages/blockchain-wallet-v4-frontend/webpack.debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,7 @@ module.exports = {
},
mangle: {
keep_fnames: true
},
nameCache: null,
toplevel: false,
ie8: false
}
},
parallel: true,
cache: true
Expand Down

0 comments on commit 78da4be

Please sign in to comment.