| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 1 | -1/+1 |
| * | Add storybook integration | Alexander Tseung | 2018-05-04 | 1 | -1/+7 |
| * | Remove eth-block-tracker package | Alexander Tseung | 2018-05-03 | 1 | -1/+0 |
| * | Pin chromedriver version to 2.36.0 | Alexander Tseung | 2018-05-03 | 1 | -1/+1 |
| * | Adds nsp check to CircleCI tests | Alexander Tseung | 2018-05-03 | 1 | -0/+1 |
| * | Adds sass-loader and style-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| * | Adds path and resolve-url-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| * | Adds css-loader and file-loader needed for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| * | Merge pull request #4111 from MetaMask/build-fix-sourcemaps | Frankie | 2018-05-01 | 1 | -1/+1 |
| |\ |
|
| | * | development - add sourcemap debug tool | kumavis | 2018-04-28 | 1 | -0/+1 |
| | * | build - minify via gulp-uglify-es instead of uglifyify | kumavis | 2018-04-28 | 1 | -1/+0 |
| * | | test - unit - use ganache instead of deprecated block-tracker test util | kumavis | 2018-04-28 | 1 | -1/+2 |
| |/ |
|
| * | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 1 | -2/+2 |
| * | Move uglifyify to MetaMask org | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| * | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 1 | -1/+1 |
| * | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| |\ |
|
| | * | fix(package): update ethjs-contract to version 0.2.0 | greenkeeper[bot] | 2018-04-19 | 1 | -1/+1 |
| * | | Merge pull request #3934 from MetaMask/node-engines | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| |\ \ |
|
| | * | | package.json - update engines field to require node v8.x.x | kumavis | 2018-04-10 | 1 | -1/+1 |
| * | | | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 1 | -1/+1 |
| | |/
|/| |
|
| * | | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 1 | -1/+1 |
| * | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 1 | -1/+4 |
| |\ \ |
|
| | * \ | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 1 | -0/+3 |
| | |\ \ |
|
| | | * | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 1 | -0/+3 |
| | * | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -1/+1 |
| | |/ / |
|
| * | | | Merge branch 'master' into i3580-InternationalizeCurrency | kumavis | 2018-04-10 | 1 | -3/+3 |
| |\| | |
|
| | * | | Merge branch 'master' into i3621-LogoPerformance | kumavis | 2018-04-10 | 1 | -2/+4 |
| | |\ \ |
|
| | | * \ | Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 | kumavis | 2018-04-10 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | fix(package): update gulp-sass to version 4.0.0 | greenkeeper[bot] | 2018-04-05 | 1 | -1/+1 |
| | | | |/ |
|
| | | * | | Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 | kumavis | 2018-04-10 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | fix(package): update ethjs to version 0.3.4 | greenkeeper[bot] | 2018-04-07 | 1 | -1/+1 |
| | | | |/ |
|
| | * | / | Improve fox logo performance | Dan Finlay | 2018-04-04 | 1 | -1/+1 |
| | | |/
| |/| |
|
| * | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 1 | -7/+3 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 1 | -9/+2 |
| | |\| |
|
| | | * | ci - job-publish - publish source+sourcemaps to sentry if new release | kumavis | 2018-04-04 | 1 | -7/+1 |
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-03 | 1 | -1/+2 |
| | |\ \ |
|
| | * \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -2/+12 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-03-31 | 1 | -2/+1 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -11/+10 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -6/+12 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -21/+36 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 1 | -7/+7 |
| | |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 1 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when isI... | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
| | * | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -0/+1 |
| * | | | | | | | | | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | |
|
| * | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -2/+1 |
| | |_|_|_|_|_|_|_|_|/
|/| | | | | | | | | |
|
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 1 | -2/+12 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | | |
|
| | * | | | | | | | | | deps - update shell-parallel | kumavis | 2018-04-03 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | lint - lint json files in app/ | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | | |_|_|_|_|_|_|/
| | |/| | | | | | | |
|
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -2/+1 |
| | |\| | | | | | | | |
|
| | * | | | | | | | | | development - ci-screens - remove mocha wrapper that was losing exit code | kumavis | 2018-03-31 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 1 | -10/+9 |
| | |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/
| | |/| | | | | | | |
|
| | * | | | | | | | | | ci - e2e+screens - add sleep to make sure ganache is ready | kumavis | 2018-03-31 | 1 | -2/+2 |
| | * | | | | | | | | | ci - e2e+screens - use shell-parallel to run ganache | kumavis | 2018-03-31 | 1 | -3/+5 |
| | * | | | | | | | | | Ganache:start script with seed phrase | Thomas | 2018-03-31 | 1 | -2/+4 |
| | * | | | | | | | | | development - create selenium screen shotter | kumavis | 2018-03-30 | 1 | -0/+1 |
| | * | | | | | | | | | test - add auto screen shotter | kumavis | 2018-03-30 | 1 | -1/+5 |
| | | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | | build - use uglifyify and gulp-multi-process for better performance | kumavis | 2018-03-31 | 1 | -1/+2 |
| | |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | | Merge pull request #3808 from MetaMask/txMeta-origin | kumavis | 2018-03-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | deps - bump proviedr-engine | frankiebee | 2018-03-31 | 1 | -1/+1 |
| | | |/ / / / / /
| |/| | | | | | |
|
| * / | | | | | | | build - properly set GULP_METAMASK_DEBUG on dev | kumavis | 2018-03-31 | 1 | -1/+0 |
| |/ / / / / / / |
|
| * | | | | | | | npm scripts - rewrite default scripts to new task names | kumavis | 2018-03-30 | 1 | -6/+5 |
| * | | | | | | | npm scripts - simplify and speed up dist builds | kumavis | 2018-03-29 | 1 | -2/+1 |
| * | | | | | | | deps - update package-lock | kumavis | 2018-03-29 | 1 | -1/+1 |
| * | | | | | | | mascara - use sw-controller and other cleanups | kumavis | 2018-03-29 | 1 | -2/+3 |
| |/ / / / / / |
|
| * | | | | | | deps - bump ethjs-query to fix unhandled promise rejections | kumavis | 2018-03-29 | 1 | -2/+2 |
| * | | | | | | Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | chore(package): update eslint-plugin-mocha to version 5.0.0 | greenkeeper[bot] | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | chore(package): update sinon to version 5.0.0 | greenkeeper[bot] | 2018-03-22 | 1 | -1/+1 |
| * | | | | | | | | test - integration - add locale build step | kumavis | 2018-03-28 | 1 | -2/+4 |
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | ci - run e2e jobs | kumavis | 2018-03-28 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 1 | -1/+10 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | * | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 1 | -21/+54 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | chromedriver, changed extension id(might need zip/crx file) | Thomas | 2018-01-19 | 1 | -3/+4 |
| | * | | | | | | | | | | | | Update | Thomas | 2018-01-18 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | E2E testing with selenium | tmashuang | 2017-09-13 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | sentry - npm scripts for uploading source maps | kumavis | 2018-03-24 | 1 | -0/+8 |
| | * | | | | | | | | | | | | | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | changes test to unit-integration-lint, closes #3650 | Lazaridis | 2018-03-22 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | |
|
| * / | | | | | | | | | | | Use extension api to get initial locale. | Dan | 2018-03-22 | 1 | -0/+1 |
| |/ / / / / / / / / / / |
|
| * | | | | | / / / / / | Revert "Issue 3505 | Transpile to ES5" | Thomas Huang | 2018-03-22 | 1 | -3/+1 |
| | |_|_|_|_|/ / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #3605 from lazaridiscom/master | kumavis | 2018-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | use mkdirp for cross-platform, re #3426 | Lazaridis | 2018-03-18 | 1 | -1/+1 |
| | | |_|_|_|/ / / / /
| |/| | | | | | | | |
|
| * / | | | | | | | | | Issue 3505 | Transpile to ES5 | Ryan Rowland | 2018-03-20 | 1 | -1/+3 |
| |/ / / / / / / / / |
|
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us... | kumavis | 2018-03-14 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | use 'cross-env' for env-variables within npm scripts, re #3426 | Lazaridis | 2018-03-14 | 1 | -3/+4 |
| | * | | | | | | | | | Moved mock-dev.js and ui-dev.js to development folder. | Vincent | 2018-03-13 | 1 | -3/+3 |
| | | |_|_|/ / / / /
| |/| | | | | | | |
|
| | * | | | | | | | | Merge pull request #3501 from MetaMask/circleci-2.0 | kumavis | 2018-03-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \
| | |_|_|/ / / / /
| |/| | | | | | | |
|
| | | * | | | | | | | test - breakout npm script for building for integration tests | kumavis | 2018-03-10 | 1 | -1/+2 |
| | * | | | | | | | | chore(package): update gulp-stylelint to version 7.0.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | * | | | | | | | | chore(package): update stylelint-config-standard to version 18.2.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | * | | | | | | | | fix(package): update gulp-autoprefixer to version 5.0.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | * | | | | | | | | deps - remove unused missippi dep | kumavis | 2018-03-10 | 1 | -1/+0 |
| | * | | | | | | | | chore(package): update browserify to version 16.1.1 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | * | | | | | | | | deps - bump pump | kumavis | 2018-03-10 | 1 | -1/+1 |
| | |/ / / / / / / |
|
| * | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 1 | -2/+2 |
| |\| | | | | | | |
|
| | * | | | | | | | Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0 | Thomas Huang | 2018-03-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | chore(package): update karma to version 2.0.0 | greenkeeper[bot] | 2017-12-22 | 1 | -1/+1 |
| | * | | | | | | | | Merge pull request #3259 from MetaMask/controllerStubs | kumavis | 2018-03-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Offline testing | Thomas Huang | 2018-02-16 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 1 | -12/+46 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | add browserify-unibabel to package.json | Csaba Solya | 2018-03-06 | 1 | -2/+3 |
| | | * | | | | | | | | | Merge branch 'master' into edge-support | Csaba S | 2018-02-22 | 1 | -5/+34 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | add edge support | Csaba Solya | 2018-02-22 | 1 | -0/+1 |
| | | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| | * | | | | | | | | | | Add version bumping script | Dan Finlay | 2018-03-03 | 1 | -0/+1 |
| | * | | | | | | | | | | Fix inpage provider name regression | Dan Finlay | 2018-03-03 | 1 | -1/+1 |
| | * | | | | | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
| | | * | | | | | | | | | fix(package): update metamascara to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
| | * | | | | | | | | | | Add node-sass to dev dependencies | Dan Finlay | 2018-02-14 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|_|/
| |/| | | | | | | | |
|
| | * | | | | | | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -7/+7 |
| | |\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | | |
|
| | | * | | | | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -7/+7 |
| | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | | * | | | | | | | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps | Thomas | 2018-01-31 | 1 | -2/+4 |
| | | | * | | | | | | | Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | chore(package): update gulp-watch to version 5.0.0 | greenkeeper[bot] | 2018-01-07 | 1 | -1/+1 |
| | | | * | | | | | | | | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | chore(package): update mocha to version 5.0.0 | greenkeeper[bot] | 2018-01-18 | 1 | -1/+1 |
| | | | | | |_|_|/ / / /
| | | | |/| | | | | | |
|
| | | | * | | | | | | | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | chore(package): update testem to version 2.0.0 | greenkeeper[bot] | 2018-01-25 | 1 | -1/+1 |
| | | | * | | | | | | | | | deps - bump eth-json-rpc-infura for kovan fix | kumavis | 2018-01-26 | 1 | -1/+1 |
| | | | |/ / / / / / / / |
|
| | * | / / / / / / / / | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 1 | -0/+1 |
| | |/ / / / / / / / / |
|
| | * | | | | | | | | | Merge branch 'master' into uat | Thomas | 2018-01-23 | 1 | -3/+3 |
| | * | | | | | | | | | Remove duplicate eth-contract-metadata | Thomas | 2018-01-23 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 1 | -4/+33 |
| | |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/
| | |/| | | | | | | |
|
| | | * | | | | | | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 1 | -5/+33 |
| | | |\ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | | | * | | | | | | | [NewUI-flat] Fix gulp build (#2975) | Dan J Miller | 2018-01-16 | 1 | -1/+2 |
| | | | * | | | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735) | Dan J Miller | 2018-01-12 | 1 | -0/+2 |
| | | | * | | | | | | | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 1 | -4/+4 |
| | | | |\ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 1 | -4/+26 |
| | | | | |\ \ \ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | | | | | |
|
| | | | | | * | | | | | | Fix sign typed data | Alexander Tseung | 2017-12-30 | 1 | -3/+3 |
| | | | * | | | | | | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 1 | -19/+24 |
| | | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / /
| | | | |/| | | | | | |
|
| | | | | * | | | | | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -2/+3 |
| | | | | |\ \ \ \ \ \ \
| | | | | | |_|_|/ / /
| | | | | |/| | | | /
| | | | | |_|_|_|_|/
| | | | |/| | | | | |
|
| | | | | * | | | | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -2/+4 |
| | | | | * | | | | | | Merge pull request #2615 from jpclark/NewUI-flat | Thomas Huang | 2017-11-29 | 1 | -8/+9 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | | * | | | | | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -0/+1 |
| | | | | | * | | | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden... | Jason Clark | 2017-11-26 | 1 | -1/+0 |
| | | | | | * | | | | | | incremental commit of working blockie component | Jason Clark | 2017-11-25 | 1 | -3/+1 |
| | | | | | * | | | | | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 1 | -4/+5 |
| | | | | | * | | | | | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -4/+6 |
| | | | | * | | | | | | | Update babelify to 8.0.0 | Thomas Huang | 2017-11-28 | 1 | -1/+1 |
| | | | | * | | | | | | | Update react, react-dom, and react-test-renderer to 15.6.2 | Thomas Huang | 2017-11-27 | 1 | -3/+3 |
| | | | | * | | | | | | | Update ethjs-query to v0.3.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| | | | | * | | | | | | | Update Qunit to QunitJS v2.4.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| | | | | * | | | | | | | Update to Enzyme 3.2.0 | Thomas Huang | 2017-11-26 | 1 | -1/+2 |
| | | | | |/ / / / / / |
|
| | | | * | | | | | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screen | frankiebee | 2017-11-08 | 1 | -1/+3 |
| | | | |\| | | | | | |
|
| | | | | * | | | | | | Update classnames for integration tests and add output/index.css to integrati... | Dan | 2017-11-03 | 1 | -1/+1 |
| | | | | * | | | | | | Get current NewUI-flat tests working. | Dan | 2017-11-03 | 1 | -0/+1 |
| | | | | * | | | | | | More lint fixes | Dan | 2017-11-02 | 1 | -0/+1 |
| | | | * | | | | | | | fix mascara build | frankiebee | 2017-11-01 | 1 | -1/+1 |
| | | | |/ / / / / / |
|
| | | | * | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -3/+10 |
| | | | |\ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -1/+20 |
| | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | Refactor amount input: dynamic input width with vanilla js. | Dan | 2017-10-13 | 1 | -1/+0 |
| | | | | * | | | | | | | | | Adds amount and gas field to sendV2. | Dan | 2017-10-13 | 1 | -0/+1 |
| | | | | * | | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 1 | -3/+3 |
| | | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | Query for gas estimates | Chi Kei Chan | 2017-09-29 | 1 | -2/+3 |
| | | | | * | | | | | | | | | | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 1 | -10/+13 |
| | | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | Add Add Token UI; Add Fuzzy search for tokens | Chi Kei Chan | 2017-09-20 | 1 | -2/+3 |
| | | | | * | | | | | | | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 1 | -21/+24 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 1 | -7/+16 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate | Chi Kei Chan | 2017-09-14 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | Reapply conversion utility changes and fix calls to utility in pending-tx. | Dan | 2017-09-14 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | | | Revert "Overhaul currency conversion utility and update calls to utility in p... | Chi Kei Chan | 2017-09-13 | 1 | -2/+0 |
| | | | | * | | | | | | | | | | | | | Overhaul currency conversion utility and update calls to utility in pending-tx. | Dan | 2017-09-13 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | Add buttons; handle back; add yarn.lock | Chi Kei Chan | 2017-09-12 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | Fixes lint errors and adds stylelint-config-standard to package.json | Dan | 2017-08-31 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | [WIP] Add packages and tasks for linting scss | sdtsui | 2017-08-14 | 1 | -3/+5 |
| | | | | * | | | | | | | | | | | | | | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 1 | -34/+37 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | Add dependencies and JSX support (reactify), for global modal implementation | sdtsui | 2017-08-09 | 1 | -0/+3 |
| | | | | * | | | | | | | | | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-merged | sdtsui | 2017-08-07 | 1 | -2/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 1 | -3/+4 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | | | | | Migrate from css to scss + autoprefixer | sdtsui | 2017-08-07 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | | | | | | | Hook up css animation | sdtsui | 2017-08-03 | 1 | -0/+2 |
| | | | | * | | | | | | | | | | | | | | | | | Add dependejncy: react-burger-menu | sdtsui | 2017-08-03 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | | Debounce storage to avoid crashing pump | Dan Finlay | 2018-01-26 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #3047 from MetaMask/fix-provider-json-parse | Kevin Serrano | 2018-01-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | deps - bump provider engine and infura-middleware for better retry and error ... | kumavis | 2018-01-20 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | | deps - bump providers for better JSON parse error messages | kumavis | 2018-01-20 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / / / / / / / | deps - bump json rpc engine for bugfix | kumavis | 2018-01-23 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #3023 from MetaMask/build-lock-gulp | Dan Finlay | 2018-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into build-lock-gulp | Thomas Huang | 2018-01-19 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | build - lock pre-release gulp dep to commit | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | deps - bump infura provider for uri length limit fix | kumavis | 2018-01-19 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | deps - re-add eth-block-tracker | kumavis | 2018-01-18 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | test - createTestProviderTools includes block tracker layer | kumavis | 2018-01-18 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | | | | deps - bump json-rpc-engine for better errors | kumavis | 2018-01-18 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2826-SignBytes | Dan Finlay | 2018-01-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2900 from MetaMask/infura-rest-api | kumavis | 2018-01-16 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into infura-rest-api | kumavis | 2018-01-12 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | deps - bump eth-json-infura | kumavis | 2018-01-10 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST api | kumavis | 2018-01-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | Bump keyringController version | Dan Finlay | 2018-01-16 | 1 | -3/+1 |
| * | | | | | | | | | | | | | | | | | | | | | Fix signTypedData bytes signing | Dan Finlay | 2018-01-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2926 from MetaMask/gulp-npmls | Dan Finlay | 2018-01-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | deps - gulp in dev deps only | kumavis | 2018-01-11 | 1 | -2/+1 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitive | Dan Finlay | 2018-01-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@1.2.5 | kumavis | 2017-12-23 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage | kumavis | 2018-01-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Update vinyl-buffer to version 1.0.1 | Thomas Huang | 2018-01-04 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | | | | | | | |
|
| * / | | | | | | | | | | | | | | | | | Derive gas price estimate from previous transactions | Dan Finlay | 2018-01-06 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / / / / | chore(package): update vinyl-source-stream to version 2.0.0 | greenkeeper[bot] | 2017-12-23 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | Add exit flag to mocha to exit after tests run | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc... | kumavis | 2017-12-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | | | | deps - bump eth-json-rpc-infura | kumavis | 2017-12-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | Add optional version field to notices | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 1 | -7/+7 |
| |\| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Update greenkeeper deps for master | Thomas Huang | 2017-11-28 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | / / / | fix(package): update react-markdown to version 3.0.0 | greenkeeper[bot] | 2017-11-20 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Add lint:fix command to gulp and npm-scripts | Daijiro Wachi | 2017-10-22 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Fix linter | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Add missing presets | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Shuffle tokens | Jacky Chan | 2017-10-21 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | | | Add BackupPhraseScreen | Jacky Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Add UniqueImageScreen | Jacky Chan | 2017-10-21 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / / | Temporarily reversal of json-rpc-engine | Kevin Serrano | 2017-10-22 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-10-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-20 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | Update eth-keyring-controller dependency | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 | Kevin Serrano | 2017-10-19 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | fix(package): update react-simple-file-input to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
| | | | | |_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Patch sandwich-expando for security update | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | deps - bump eth-json-rpc-filters | kumavis | 2017-10-19 | 1 | -1/+1 |
| |/ / / / / / / / / / / / |
|
