Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 1 | -4/+67 |
|\ | | | | | | | initial-trezor-support | ||||
| * | fix lint errors | brunobar79 | 2018-07-04 | 1 | -17/+74 |
| | | |||||
* | | package.json updated and tests passing | brunobar79 | 2018-07-04 | 1 | -0/+57 |
| | | |||||
* | | tests are passing | brunobar79 | 2018-07-04 | 1 | -39262/+30830 |
| | | |||||
* | | package-lock update | brunobar79 | 2018-07-04 | 1 | -27/+10 |
| | | |||||
* | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -853/+13472 |
|\ \ | |||||
| * | | ignore lodash vulnerability | brunobar79 | 2018-07-04 | 1 | -13/+7 |
| |/ | |||||
* | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -3/+22 |
|\| | |||||
| * | point eth-contract-metadata to repo master | Esteban MIno | 2018-07-03 | 1 | -3/+2 |
| | | |||||
* | | update package-lock.json | brunobar79 | 2018-07-03 | 1 | -9745/+6172 |
| | | |||||
* | | fix merge conflicts | brunobar79 | 2018-07-03 | 1 | -3620/+2741 |
|\| | |||||
| * | npm 6 fresh lock + node 8 (#4675) | Bruno Barbieri | 2018-07-03 | 1 | -32449/+32250 |
| | | | | | | | | | | | | | | * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash | ||||
* | | use latest eth-keyring-controller | brunobar79 | 2018-07-02 | 1 | -2/+3 |
| | | |||||
* | | fix merge conflicts | brunobar79 | 2018-07-02 | 1 | -6554/+7166 |
|\| | |||||
| * | Use supersonic instead of httpserver to serve local dapp (e2e beta tests) | Dan | 2018-06-28 | 1 | -19/+540 |
| | | |||||
| * | Update package-lock.json | Dan | 2018-06-28 | 1 | -6526/+6601 |
| | | |||||
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-14 | 1 | -0/+52 |
| |\ | | | | | | | | | | ValidateEmptyKey | ||||
| * | | Make account import tests much more specific | Dan Finlay | 2018-06-12 | 1 | -6457/+6513 |
| | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid. | ||||
* | | | use latest eth-trezor-keyring | brunobar79 | 2018-06-26 | 1 | -1/+1 |
| | | | |||||
* | | | fixes | brunobar79 | 2018-06-23 | 1 | -6548/+6539 |
| | | | |||||
* | | | fix merge conflicts | Bruno | 2018-06-13 | 1 | -17/+75 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add script for auto-re-running tests on change | Dan Finlay | 2018-06-13 | 1 | -6468/+6524 |
| | | | | | | | | | | | | | | | `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes. | ||||
* | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -0/+46 |
| | | | |||||
* | | | initial trezor support | Bruno | 2018-06-10 | 1 | -6470/+6479 |
|/ / | |||||
* | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 1 | -15/+15 |
|\| | |||||
| * | deps - update package-lock via npm@5.10.0 | kumavis | 2018-06-04 | 1 | -8/+15 |
| | | |||||
| * | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 1 | -30/+23 |
| | | |||||
* | | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-06-01 | 1 | -0/+12 |
|\ \ | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | ||||
| * | | Stop using external NumericInput component. | Dan | 2018-05-30 | 1 | -5/+12 |
| | | | |||||
| * | | Replaces currency-input.js with NumericInput | Dan | 2018-05-29 | 1 | -0/+144 |
| | | | |||||
* | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-01 | 1 | -60/+138 |
|\ \ \ | | |/ | |/| | |||||
| * | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 1 | -7/+13 |
| | | | |||||
| * | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 1 | -48/+55 |
| |\ \ | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | ||||
| | * | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 1 | -48/+55 |
| | | | | |||||
| * | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |/| | | test - unit - fail if tests contain a .only call | ||||
| | * | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 1 | -0/+6 |
| | |/ | |||||
| * / | fix: Why does npm insist on reordering the lockfile? | Whymarrh Whitby | 2018-05-25 | 1 | -10/+170 |
| |/ | |||||
* / | Update amount error on update of send screen. | Dan | 2018-05-31 | 1 | -0/+139 |
|/ | |||||
* | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 1 | -83/+78 |
|\ | | | | | Update designs for Add Token screen | ||||
| * | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 1 | -83/+78 |
| | | |||||
| * | Add new json-rpc-engine middleware for improved error handling | bitpshr | 2018-05-14 | 1 | -182/+1351 |
| | | |||||
* | | Merge branch 'develop' of https://github.com/Jabher/metamask-extension into ↵ | kumavis | 2018-05-22 | 1 | -4/+4 |
|\ \ | | | | | | | | | | Jabher-develop | ||||
| * | | bump extensionizer version to 1.0.1 (see ↵ | jabher | 2018-05-08 | 1 | -4/+4 |
| | | | | | | | | | | | | https://github.com/MetaMask/extensionizer/pull/4) | ||||
* | | | Update eth-keyring-controller dependency | Whymarrh Whitby | 2018-05-17 | 1 | -193/+1362 |
| |/ |/| | |||||
* | | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 1 | -8/+311 |
| | | |||||
* | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-12 | 1 | -1412/+243 |
|\ \ | |||||
| * | | Update lodash | Alexander Tseung | 2018-05-10 | 1 | -51/+51 |
| | | | |||||
| * | | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 1 | -1361/+192 |
| | | | |||||
* | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-09 | 1 | -0/+3009 |
|\| | | |||||
| * | | Add storybook integration | Alexander Tseung | 2018-05-04 | 1 | -0/+3015 |
| |/ | |||||
* | | Bump package lock | Thomas | 2018-05-04 | 1 | -629/+285 |
| | | |||||
* | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 1 | -346/+2509 |
|\| | |||||
| * | Pin chromedriver version to 2.36.0 | Alexander Tseung | 2018-05-03 | 1 | -180/+1359 |
| | | |||||
| * | Adds nsp check to CircleCI tests | Alexander Tseung | 2018-05-03 | 1 | -0/+303 |
| | | |||||
| * | Adds sass-loader and style-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+121 |
| | | |||||
| * | Adds path and resolve-url-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+165 |
| | | |||||
| * | Adds css-loader and file-loader needed for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -1395/+1721 |
| | | |||||
| * | Merge pull request #4111 from MetaMask/build-fix-sourcemaps | Frankie | 2018-05-01 | 1 | -51/+43 |
| |\ | | | | | | | Build - fix sourcemaps | ||||
| | * | deps - package-lock | kumavis | 2018-04-28 | 1 | -51/+43 |
| | | | |||||
| * | | deps - package-lock | kumavis | 2018-04-28 | 1 | -38/+80 |
| | | | |||||
| * | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 1 | -8/+34 |
| |/ | | | | | | | | | | | * Allow transactions with 0-gwei gas price * Add tests to verify tx with 0 gas fee * Conditionally use CurrencyInput in CurrencyDisplay | ||||
| * | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 1 | -39/+173 |
| | | |||||
| * | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 1 | -74/+1660 |
| | | | | | | | | | | | | | | | | | | | | | | | | May fix #3999, but will need to see if Mozilla can reproduce the build with this updated repo. Switches our `uglifyify` dependency from the production one (under-maintained) to one that I've merged a critical patch into. I'm open to discussion of how else we might approach this problem here. Maybe we should use a different minification module entirely, remove minification, or maybe refactor our build system! | ||||
* | | Firefox | Thomas | 2018-05-02 | 1 | -63/+1858 |
|/ | |||||
* | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 1 | -3/+3 |
| | |||||
* | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 1 | -32/+35 |
| | |||||
* | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 1 | -78/+549 |
|\ | |||||
| * | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 1 | -0/+119 |
| |\ | | | | | | | Add JSDocs Page and Script | ||||
| | * | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 1 | -61/+546 |
| | | | | | | | | | | | | Includes new script `npm run doc` for generating docs page. | ||||
| * | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 1 | -101/+136 |
| | | | |||||
| * | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -194/+511 |
| |/ | |||||
* | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 1 | -21/+85 |
|\| | |||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -4/+4 |
| |\ | | | | | | | | | | cb-254 | ||||
| | * | ci - job-publish - publish source+sourcemaps to sentry if new release | kumavis | 2018-04-04 | 1 | -4/+4 |
| | | | |||||
| * | | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -17/+81 |
| |/ | |||||
* / | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -0/+20 |
|/ | | | | Fixes #3580 | ||||
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 1 | -329/+2891 |
|\ | |||||
| * | deps - update shell-parallel | kumavis | 2018-04-03 | 1 | -3/+14 |
| | | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -9/+122 |
| |\ | |||||
| | * | lint - lint json files in app/ | kumavis | 2018-04-03 | 1 | -0/+113 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -349/+384 |
| |\| | |||||
| | * | deps - bump package-lock.json | kumavis | 2018-04-03 | 1 | -47/+0 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 1 | -331/+739 |
| |\ \ | |||||
| * | | | ci - e2e+screens - use shell-parallel to run ganache | kumavis | 2018-03-31 | 1 | -14/+200 |
| | | | | |||||
| * | | | Update package-lock | Thomas | 2018-03-31 | 1 | -0/+1819 |
| | | | | |||||
| * | | | development - create selenium screen shotter | kumavis | 2018-03-30 | 1 | -0/+168 |
| | | | | |||||
* | | | | build - use uglifyify and gulp-multi-process for better performance | kumavis | 2018-03-31 | 1 | -51/+72 |
| |_|/ |/| | | |||||
* | | | deps - bump proviedr-engine | frankiebee | 2018-03-31 | 1 | -12/+12 |
| |/ |/| | |||||
* | | deps - update package-lock | kumavis | 2018-03-29 | 1 | -87/+225 |
| | | |||||
* | | deps - update pakage-lock | kumavis | 2018-03-29 | 1 | -10/+97 |
|/ | |||||
* | deps - bump ethjs-query to fix unhandled promise rejections | kumavis | 2018-03-29 | 1 | -12/+17 |
| | |||||
* | deps - update package-lock (maybe greenkeeper forgot?) | kumavis | 2018-03-29 | 1 | -23/+34 |
| | |||||
* | deps - update package-lock | kumavis | 2018-03-28 | 1 | -3/+63 |
| | |||||
* | deps - update package-lock | kumavis | 2018-03-28 | 1 | -0/+6 |
| | |||||
* | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 1 | -3/+65 |
|\ | |||||
| * | sentry - npm scripts for uploading source maps | kumavis | 2018-03-24 | 1 | -0/+63 |
| | | |||||
| * | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 1 | -0/+10 |
|\| | |||||
| * | corrected vn -> vi | Viet Le | 2018-03-18 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 1 | -0/+10 |
|\| | |||||
| * | deps - update package-lock | kumavis | 2018-03-14 | 1 | -0/+10 |
| | | |||||
* | | Add selenium-webdriver and chromedriver | Thomas | 2018-03-10 | 1 | -0/+175 |
|/ | |||||
* | deps - update package-lock | kumavis | 2018-03-10 | 1 | -1037/+1998 |
| | |||||
* | deps - bump pump | kumavis | 2018-03-10 | 1 | -1439/+208 |
| | |||||
* | meta - add package-lock to git | kumavis | 2018-03-09 | 1 | -0/+22511 |
| | |||||
* | gitignore - remove cached package-lock | kumavis | 2017-06-13 | 1 | -7348/+0 |
| | |||||
* | Version 3.7.3v3.7.3 | Dan Finlay | 2017-06-02 | 1 | -0/+7348 |