Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | clean up | Bruno | 2018-06-13 | 1 | -16/+19 |
* | fix merge conflicts | Bruno | 2018-06-13 | 12 | -125/+146 |
|\ | |||||
| * | Merge branch 'develop' of git://github.com/Metamask/metamask-extension into d... | Bruno | 2018-06-13 | 12 | -6576/+6595 |
| |\ | |||||
| | * | Merge pull request #4558 from MetaMask/stop-reload-on-network-change | Dan Finlay | 2018-06-13 | 3 | -65/+20 |
| | |\ | |||||
| | | * | Merge branch 'develop' into stop-reload-on-network-change | Erik Marks | 2018-06-13 | 172 | -7992/+14314 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fix | kumavis | 2018-06-13 | 4 | -40/+47 |
| | |\ \ | |||||
| | | * | | controllers - transaction - prefer log over console | kumavis | 2018-06-13 | 1 | -2/+2 |
| | | * | | metamask - ensure all nonce locks are released | kumavis | 2018-06-13 | 4 | -17/+18 |
| | | * | | nonce-tracker - wrap nonce calculations in try-catch and release lock on error | kumavis | 2018-06-13 | 1 | -22/+28 |
| | * | | | Merge pull request #4556 from MetaMask/WatchTestReload | Dan Finlay | 2018-06-13 | 2 | -6468/+6525 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Add script for auto-re-running tests on change | Dan Finlay | 2018-06-13 | 2 | -6468/+6525 |
| | |/ / | |||||
| | * | | Merge pull request #4554 from whymarrh/fix-e2e-profile-path | Whymarrh Whitby | 2018-06-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fix e2e test Chrome profile paths | Whymarrh Whitby | 2018-06-13 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screen | Dan J Miller | 2018-06-11 | 2 | -2/+2 |
| | |\ \ | |||||
| | | * | | Access correct property from state in confirm screen components gatherTxMeta() | Dan | 2018-06-08 | 2 | -2/+2 |
| | |/ / | |||||
| | | * | update changelog | Erik Marks | 2018-06-13 | 1 | -0/+3 |
| | | * | undo package.json and package-lock.json changes | Erik Marks | 2018-06-13 | 2 | -6817/+6539 |
| | | * | removed auto-reload.js, moved global web3 export to inpage.js | Erik Marks | 2018-06-13 | 2 | -43/+16 |
| | | * | wip | Erik Marks | 2018-06-13 | 4 | -6580/+6839 |
| * | | | Merge branch 'develop' of https://github.com/brunobar79/metamask-extension in... | Bruno | 2018-06-13 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-06-06 | 67 | -317/+841 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-05-31 | 149 | -17174/+5990 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-05-17 | 97 | -3419/+8695 |
| | |\ \ \ \ | |||||
* | | | | | | | upgrade eth-trezor-keyring | Bruno | 2018-06-13 | 1 | -1/+1 |
* | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 6 | -1383/+53 |
* | | | | | | | added support for signPersonalMessage | Bruno | 2018-06-13 | 1 | -28/+45 |
* | | | | | | | clean up | Bruno | 2018-06-11 | 1 | -92/+21 |
* | | | | | | | sign transactions is pretty close | Bruno | 2018-06-11 | 1 | -49/+77 |
* | | | | | | | balances working | Bruno | 2018-06-11 | 3 | -6/+22 |
* | | | | | | | add account working | Bruno | 2018-06-11 | 2 | -8/+13 |
* | | | | | | | clean up | Bruno | 2018-06-11 | 2 | -8/+15 |
* | | | | | | | initial trezor support | Bruno | 2018-06-10 | 14 | -6478/+8369 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBug | Dan Finlay | 2018-06-08 | 3 | -6/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix bug where reset account would not work. | Dan Finlay | 2018-06-07 | 3 | -6/+12 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #4090 from MetaMask/i3725-refactor-send-component- | Dan J Miller | 2018-06-07 | 163 | -1349/+7527 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bump beta e2e timeouts on faucet page. | Dan | 2018-06-07 | 2 | -4/+4 |
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 7 | -141/+218 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4385 from MetaMask/ci-test-e2e-beta | kumavis | 2018-06-07 | 6 | -141/+217 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Improve e2e beta tests by adding appropriate waits. | Dan | 2018-06-07 | 2 | -47/+56 |
| * | | | | | | Conditionally close info page in beta e2e tests. | Dan | 2018-06-06 | 2 | -4/+14 |
| * | | | | | | Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-beta | Dan | 2018-06-06 | 2 | -63/+79 |
| * | | | | | | Fix e2e beta tests to account for add-token updates and actual behaviour of t... | Dan | 2018-06-06 | 2 | -14/+10 |
| * | | | | | | Merge branch 'develop' into ci-test-e2e-beta | Dan | 2018-06-06 | 29 | -70/+452 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Adjust delays in new beta e2e tests | Whymarrh Whitby | 2018-06-02 | 1 | -2/+2 |
| * | | | | | | ci - breakout firefox helpers into scripts | kumavis | 2018-06-02 | 3 | -23/+19 |
| * | | | | | | ci - run e2e:beta tests | kumavis | 2018-06-02 | 1 | -4/+53 |
* | | | | | | | Merge pull request #4477 from MetaMask/i3073-block-gravityforms | kumavis | 2018-06-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Block gravityforms.com from web3 injection | Dan Finlay | 2018-06-04 | 1 | -0/+1 |
| | | | * | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 33 | -131/+394 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics | Thomas Huang | 2018-06-07 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test - metamask-controller - disable diagnostics | kumavis | 2018-06-06 | 1 | -0/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4414 from scsaba/recipient-blacklist | kumavis | 2018-06-07 | 5 | -1/+137 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove generating blocked accounts and use a config file instead | Csaba Solya | 2018-05-31 | 4 | -29/+30 |
| * | | | | | | | | fix documentation | Csaba Solya | 2018-05-30 | 1 | -1/+1 |
| * | | | | | | | | adding tests for recipient blacklist checker | Csaba Solya | 2018-05-30 | 3 | -5/+83 |
| * | | | | | | | | adding transaction controller tests | Csaba Solya | 2018-05-30 | 2 | -1/+18 |
| * | | | | | | | | initial implementation | Csaba Solya | 2018-05-30 | 2 | -1/+41 |
* | | | | | | | | | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 4 | -19/+47 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-05 | 23 | -60/+366 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 47 | -282/+458 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 2 | -4/+2 |
| * | | | | | | | | | | | Importing account by json and private key shows error and does not change acc... | Dan | 2018-05-31 | 4 | -16/+46 |
* | | | | | | | | | | | | Merge pull request #4514 from whymarrh/account-label-type-check | kumavis | 2018-06-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel | Whymarrh Whitby | 2018-06-06 | 1 | -0/+1 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | i18n - ja improvements | 03-26 | 2018-06-07 | 7 | -18/+75 |
* | | | | | | | | | | | | Merge pull request #4515 from MetaMask/master | Thomas Huang | 2018-06-07 | 2 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4511 from MetaMask/v4.7.4 | kumavis | 2018-06-06 | 8 | -49/+102 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 4.7.4v4.7.4 | kumavis | 2018-06-06 | 2 | -1/+6 |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4 | kumavis | 2018-06-06 | 2 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #4490 from MetaMask/v4.7.3 | Thomas Huang | 2018-06-05 | 20 | -41/+293 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | changelog - add note on new modalv4.7.3 | kumavis | 2018-06-05 | 1 | -0/+1 |
| | * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3 | kumavis | 2018-06-05 | 3 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | 4.7.3 | kumavis | 2018-06-05 | 2 | -2/+6 |
* | | | | | | | | | | | | | | Merge pull request #4507 from whymarrh/fix-account-order | Dan J Miller | 2018-06-07 | 10 | -45/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix mock addresses used for integration tests | Whymarrh Whitby | 2018-06-06 | 6 | -18/+18 |
| * | | | | | | | | | | | | | Fix account list order for the old UI | Whymarrh Whitby | 2018-06-06 | 1 | -2/+3 |
| * | | | | | | | | | | | | | Render the accounts in keyring order | Whymarrh Whitby | 2018-06-06 | 1 | -3/+4 |
| * | | | | | | | | | | | | | Remove unused identities reducer from UI | Whymarrh Whitby | 2018-06-06 | 2 | -22/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #4509 from whymarrh/wallet-view-assertion | kumavis | 2018-06-06 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 |
| * | | | | | | | | | | | | | Ensure selectedAddress exists when render wallet | Whymarrh Whitby | 2018-06-06 | 1 | -0/+4 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #4506 from MetaMask/diagnostics-multivault | kumavis | 2018-06-06 | 5 | -43/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | diagnostics - fix reportMultipleKeyrings call | kumavis | 2018-06-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | diagnostics - minor fixes | kumavis | 2018-06-06 | 2 | -5/+5 |
| * | | | | | | | | | | | | lint - fix diagnostics reporter | kumavis | 2018-06-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 5 | -71/+84 |
| * | | | | | | | | | | | | add multivault detection to diagnostics reporting | kumavis | 2018-06-06 | 1 | -0/+33 |
|/ / / / / / / / / / / / | |||||
| | | | | | | | * | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 29 | -72/+400 |
| | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482) | Dan J Miller | 2018-06-05 | 3 | -3/+3 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentities | kumavis | 2018-06-05 | 5 | -4/+135 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Record identity before deleting it | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| * | | | | | | | | | | | Mock notifier in test | Dan Finlay | 2018-06-05 | 2 | -1/+7 |
| * | | | | | | | | | | | Add comment | Dan Finlay | 2018-06-05 | 1 | -0/+2 |
| * | | | | | | | | | | | Do not alert to user | Dan Finlay | 2018-06-05 | 1 | -5/+0 |
| * | | | | | | | | | | | Linted | Dan Finlay | 2018-06-05 | 2 | -1/+2 |
| * | | | | | | | | | | | Add bug info under metadata key | Dan Finlay | 2018-06-05 | 1 | -1/+7 |
| * | | | | | | | | | | | Add first time info to bug report | Dan Finlay | 2018-06-05 | 2 | -1/+5 |
| * | | | | | | | | | | | Add version to report | Dan Finlay | 2018-06-05 | 2 | -4/+6 |
| * | | | | | | | | | | | Add changelog entry | Dan Finlay | 2018-06-05 | 1 | -0/+2 |
| * | | | | | | | | | | | Fine tune error posting | Dan Finlay | 2018-06-05 | 2 | -6/+2 |
| * | | | | | | | | | | | Only notify first time lost ids are detected | Dan Finlay | 2018-06-05 | 1 | -2/+8 |
| * | | | | | | | | | | | Add reporting uri | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| * | | | | | | | | | | | Begin adding unconfigured notifier | Dan Finlay | 2018-06-05 | 2 | -13/+21 |
| * | | | | | | | | | | | Persist lost identities to storage for later analysis | Dan Finlay | 2018-06-05 | 2 | -2/+33 |
| * | | | | | | | | | | | Add minimal user notification of issue. | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| * | | | | | | | | | | | Add identity synchronizing code | Dan Finlay | 2018-06-05 | 2 | -1/+48 |
| * | | | | | | | | | | | Add failing test for unknown identity entry | Dan Finlay | 2018-06-05 | 1 | -3/+28 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 2 | -4/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-02 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fix ellipses | Alexander Tseung | 2018-06-01 | 1 | -5/+6 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | / | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 2 | -3/+11 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Reduce height of notice container in onboarding (#4435) | Alexander Tseung | 2018-06-05 | 1 | -8/+9 |
* | | | | | | | | | | | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 8 | -21/+127 |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4471 from MetaMask/master | Dan Finlay | 2018-06-04 | 3 | -9/+23 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4470 from MetaMask/v4.7.2 | Dan Finlay | 2018-06-04 | 11 | -24/+85 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 4.7.2 - additional changelog notesv4.7.2 | kumavis | 2018-06-04 | 1 | -0/+3 |
| | * | | | | | | | | | 4.7.2 | kumavis | 2018-06-04 | 2 | -1/+5 |
| | * | | | | | | | | | deps - update package-lock via npm@5.10.0 | kumavis | 2018-06-04 | 1 | -8/+15 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4467 from MetaMask/preferences-account-sync | Dan Finlay | 2018-06-04 | 2 | -3/+34 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | metamask-controller - clear account labels on restore from seed phrase | kumavis | 2018-06-04 | 1 | -0/+4 |
| * | | | | | | | | | | preferences controller - jsdoc fix | kumavis | 2018-06-04 | 1 | -2/+2 |
| * | | | | | | | | | | metamask - update preferences controller identities on keyring controller update | kumavis | 2018-06-04 | 2 | -3/+30 |
* | | | | | | | | | | | Merge pull request #4353 from MetaMask/publishing-guide-update | kumavis | 2018-06-04 | 1 | -7/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Update publishing.md | Dan Finlay | 2018-05-24 | 1 | -5/+5 |
| * | | | | | | | | | | Update publishing guide | Dan Finlay | 2018-05-24 | 1 | -6/+20 |
* | | | | | | | | | | | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix | kumavis | 2018-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | sentry - message rewrite - guard against missing message | kumavis | 2018-05-31 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4425 from MetaMask/master | kumavis | 2018-06-02 | 3 | -2/+28 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4449 from MetaMask/Version-4.7.1 | kumavis | 2018-06-02 | 42 | -271/+434 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Version 4.7.1v4.7.1 | Dan Finlay | 2018-06-02 | 3 | -1/+22 |
| | * | | | | | | | | | Merge branch 'master' into develop | Dan Finlay | 2018-06-02 | 2 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4408 from MetaMask/v4.7.0rc2 | Thomas Huang | 2018-05-31 | 205 | -18582/+12645 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 4.7.0v4.7.0 | kumavis | 2018-05-31 | 2 | -2/+6 |
| | * | | | | | | | | | changelog - add note on brave | kumavis | 2018-05-31 | 1 | -0/+1 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4436 from MetaMask/bmd/update-zenhub-links | Dan Finlay | 2018-06-02 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
* | | | | | | | | | | | Merge pull request #4438 from wjmelements/yarn | Dan Finlay | 2018-06-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | recommend yarn for node >= 10 | William Morriss | 2018-06-01 | 1 | -1/+3 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #4450 from MetaMask/fix-migration-26 | Dan Finlay | 2018-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix return value of migration 26 when missing KC or PC | Whymarrh Whitby | 2018-06-02 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4433 from MetaMask/i4431-error-throwing | kumavis | 2018-06-02 | 2 | -30/+24 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 2 | -30/+24 |
|/ / / / / / / / / | |||||
| | | | | | * | | | Merge pull request #4350 from MetaMask/i3914-fix-newui-send-gas-estimation | Dan J Miller | 2018-06-05 | 23 | -165/+461 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Simplify recipient code check in send.utils estimateGas | Dan | 2018-06-05 | 1 | -4/+5 |
| | | | | | | * | | | Default currency-display valueToRender to empty string when not readOnly ('0'... | Dan | 2018-06-02 | 1 | -2/+2 |
| | | | | | | * | | | Fix calculation of data property for gas estimation on token transfers. | Dan | 2018-06-02 | 7 | -47/+41 |
| | | | | | | * | | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e... | Dan | 2018-06-01 | 79 | -550/+2072 |
| | | | | | | |\ \ \ | | | | | | | |/ / / | | | | | | |/| | | | |||||
| | | | | | * | | | | Remove .only | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | | * | | | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask... | Dan | 2018-06-01 | 9 | -156/+108 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-nume... | Dan J Miller | 2018-06-01 | 9 | -156/+108 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * | | | | Fix send amount field select in send-new-ui integration test. | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | | | | * | | | | Improve input width calculation in currency-display.js | Dan | 2018-06-01 | 1 | -3/+2 |
| | | | | | | | * | | | | Fix send-new-ui gas fee display expectation. | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | | | | * | | | | Fix currency display send integration tests. | Dan | 2018-05-31 | 2 | -2/+2 |
| | | | | | | | * | | | | Delete currency-input.js | Dan | 2018-05-30 | 2 | -114/+0 |
| | | | | | | | * | | | | Remove currency input from input-number | Dan | 2018-05-30 | 1 | -4/+4 |
| | | | | | | | * | | | | Stop using external NumericInput component. | Dan | 2018-05-30 | 3 | -14/+27 |
| | | | | | | | * | | | | Replaces currency-input.js with NumericInput | Dan | 2018-05-29 | 7 | -38/+231 |
| | | | | | * | | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-01 | 71 | -394/+1963 |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | / / / / / | | | | | | |/ / / / / | |||||
* | | | | | | | | | | | Add new alert modals | Alexander Tseung | 2018-06-01 | 21 | -178/+309 |
* | | | | | | | | | | | Change btn-secondary styles to btn-default. Make btn-secondary red warning st... | Alexander Tseung | 2018-06-01 | 16 | -62/+79 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controller | kumavis | 2018-05-31 | 2 | -8/+14 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 2 | -8/+14 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 4 | -12/+4 |
* | | | | | | | | | Merge pull request #4407 from MetaMask/e2e-test | kumavis | 2018-05-31 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Delay before getting address text | Thomas | 2018-05-30 | 1 | -0/+1 |
| * | | | | | | | | | Merge branch 'develop' into e2e-test | Thomas | 2018-05-30 | 11 | -79/+143 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add account | Thomas | 2018-05-30 | 1 | -0/+6 |
* | | | | | | | | | | | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4402 from MetaMask/danjm-changelog-update-52918 | kumavis | 2018-05-30 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update changelog | Dan J Miller | 2018-05-30 | 1 | -0/+11 |
* | | | | | | | | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 3 | -55/+60 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ci - job-screens - use e2e funcs | kumavis | 2018-05-30 | 1 | -6/+4 |
| * | | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 2 | -49/+56 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 2 | -1/+8 |
* | | | | | | | | | | | Add rpc key to i18n messages (#4375) | Alexander Tseung | 2018-05-30 | 1 | -0/+3 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4399 from MetaMask/merge-master | kumavis | 2018-05-30 | 7 | -23/+72 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma... | kumavis | 2018-05-30 | 7 | -23/+72 |
|/| | | | | | | | | | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #4384 from antonper/master | kumavis | 2018-05-30 | 3 | -10/+37 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 3 | -19/+36 |
| | * | | | | | | | | error message fix | Anton | 2018-05-29 | 1 | -2/+1 |
| | * | | | | | | | | Clean up user rejection error message | Anton | 2018-05-28 | 1 | -3/+14 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3997 from jakubsta/master | kumavis | 2018-05-22 | 2 | -5/+12 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Update: allow other extension to connect | Jakub Stasiak | 2018-04-18 | 2 | -5/+12 |
| * | | | | | | | | Merge pull request #4140 from MetaMask/v4.6.1 | Thomas Huang | 2018-05-01 | 43 | -660/+887 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Version 4.6.1 | kumavis | 2018-05-01 | 2 | -2/+9 |
| * | | | | | | | | | Merge pull request #4131 from MetaMask/emitter-cleanup | kumavis | 2018-05-01 | 1 | -7/+14 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | require log | frankiebee | 2018-05-01 | 1 | -0/+1 |
| | * | | | | | | | | | log emitter errors | frankiebee | 2018-04-30 | 1 | -6/+10 |
| | * | | | | | | | | | transactions - run event emitters outside context of _setTxStatus | frankiebee | 2018-04-30 | 1 | -7/+9 |
* | | | | | | | | | | | Merge pull request #4394 from MetaMask/MissionStatement | kumavis | 2018-05-30 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Mission v2 | Dan Finlay | 2018-05-30 | 1 | -3/+3 |
| * | | | | | | | | | | | Add mission statement v1 | Dan Finlay | 2018-05-30 | 2 | -2/+20 |
* | | | | | | | | | | | | Merge pull request #4390 from MetaMask/i18n-brave-fix | kumavis | 2018-05-30 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 |
* | | | | | | | | | | | | | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 16 | -71/+317 |
* | | | | | | | | | | | | | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 4 | -44/+84 |
* | | | | | | | | | | | | Merge pull request #4393 from MetaMask/newui-unlock-catch | kumavis | 2018-05-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix | kumavis | 2018-05-29 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| * | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ac... | kumavis | 2018-05-29 | 1 | -10/+10 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2e | kumavis | 2018-05-29 | 7 | -12/+1143 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 6 | -2/+973 |
| * | | | | | | | | | | fix: Why does npm insist on reordering the lockfile? | Whymarrh Whitby | 2018-05-25 | 1 | -10/+170 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 | kumavis | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | fix(package): update ethjs to version 0.4.0 | greenkeeper[bot] | 2018-05-12 | 1 | -1/+1 |
* | | | | | | | | | | Fix scrolling in Deposit Ether modal (#4336) | Alexander Tseung | 2018-05-24 | 1 | -2/+4 |
| | | | | | | | * | | Improve efficiency of estimateGasPriceFromRecentBlocks | Dan | 2018-05-31 | 1 | -10/+5 |
| | | | | | | | * | | test - send-utils.test - lint fix | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | | | | | | * | | Gas estimation uses block gas limit as fallback if query.estimateGas returns ... | Dan | 2018-05-31 | 2 | -5/+39 |
| | | | | | | | * | | Auto update gas estimate when to changes. | Dan | 2018-05-31 | 15 | -64/+123 |
| | | | | | | | * | | Fix test to account for greater precision currency display. | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | | | | * | | Support smaller decimals in currency-display | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | | | | * | | Estimate gas using same algorithm as backend. | Dan | 2018-05-31 | 12 | -98/+153 |
| | | | | | | | * | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ... | Dan | 2018-05-31 | 13 | -55/+203 |
| | | | | | | | * | | getParamsForGasEstimate extracts symbol from token instead of just accepting ... | Dan | 2018-05-31 | 3 | -6/+6 |
| | | | | | | | * | | Rename gas change actions. | Dan | 2018-05-31 | 4 | -22/+22 |
| | | | | | | | * | | Split out getGasEstimate logic from updateGasTotal | Dan | 2018-05-31 | 1 | -3/+12 |
| | | | | | | |/ / | | | | | | |/| | | |||||
| | | | | | * | | | Update amount error on update of send screen. | Dan | 2018-05-31 | 4 | -23/+169 |
| | | | | | * | | | Fix setting of token balance on account switch in send screen from field. | Dan | 2018-05-31 | 3 | -3/+3 |
| | | | | | |/ / | |||||
| | | | | | * | | Send refactor: fix error handling and form disabling in send form. | Dan | 2018-05-26 | 8 | -47/+37 |
| | | | | | * | | Clean up for send refactor PR. | Dan | 2018-05-25 | 6 | -17/+8 |
| | | | | | * | | Move formShouldBeDisabled from send-footer util to component. | Dan | 2018-05-25 | 4 | -40/+72 |
| | | | | | * | | Fix order of button text in page-container-footer. | Dan | 2018-05-25 | 2 | -10/+4 |
| | | | | | * | | Display correct titles and subtitles on send token and editing send transacti... | Dan | 2018-05-25 | 9 | -14/+112 |
| | | | | | * | | Fix display of primary currency symbol in send amount row | Dan | 2018-05-25 | 2 | -2/+8 |
| | | | | | * | | Send refactor: fix amount max button for tokens. | Dan | 2018-05-24 | 2 | -2/+13 |
| | | | | | * | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-24 | 141 | -18228/+4692 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #4337 from MetaMask/recent-blocks-parallel | Frankie | 2018-05-23 | 1 | -15/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | controllers - recent-blocks - pull first historical blocks in parallel | kumavis | 2018-05-22 | 1 | -15/+7 |
* | | | | | | | | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 36 | -1557/+691 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 6 | -53/+57 |
| |\| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 9 | -13446/+22 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 23 | -1810/+342 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 8 | -548/+1503 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Moved loose some loose test files to sub folders | tmashuang | 2018-05-21 | 29 | -59/+108 |
| * | | | | | | | | | | | | signMessage and signPersonalMessage | Thomas | 2018-05-18 | 1 | -13/+33 |
| * | | | | | | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 26 | -328/+371 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 62 | -2419/+5812 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int... | Thomas | 2018-05-17 | 245 | -5461/+19016 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | console.log -> assert.equal | Thomas | 2018-05-09 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | ImportAccountWithStrategies Json and Keystore | Thomas | 2018-05-09 | 1 | -0/+30 |
| | * | | | | | | | | | | | | | Remove approvePersonalMessage test | Thomas | 2018-05-08 | 1 | -45/+0 |
| | * | | | | | | | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-08 | 114 | -1662/+7483 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Bump package-lock | Thomas | 2018-04-25 | 1 | -621/+186 |
| | * | | | | | | | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 2 | -1/+46 |
| | * | | | | | | | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-24 | 117 | -1908/+5281 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |