| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | Re-enable dapp reload on network change | Dan Finlay | 2018-06-15 | 3 | -1/+67 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform. Makes it easy to re-implement the change. | |||||
| | | | * / / / | v4.8.0 | Thomas | 2018-06-15 | 2 | -8/+10 | |
| | | |/ / / / | |/| | | | | ||||||
| | * | | | | | Merge pull request #4524 from MetaMask/save-brave | Thomas Huang | 2018-06-15 | 2 | -3/+18 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Save Brave Fixes #4270 | |||||
| | | * \ \ \ \ | Merge branch 'develop' into save-brave | kumavis | 2018-06-15 | 39 | -6789/+6857 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #4571 from MetaMask/disable-diagnostics | Dan Finlay | 2018-06-15 | 1 | -8/+0 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | diagnostics - temporarily disable | |||||
| | | * | | | | | | diagnostics - temporarily disable | kumavis | 2018-06-14 | 1 | -8/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge pull request #4566 from MetaMask/notice-phishing | Dan Finlay | 2018-06-15 | 23 | -183/+140 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Push new notice on recent phishing incidents | |||||
| | | * | | | | | | | test - e2e-beta - from import - handle phishing warning | kumavis | 2018-06-14 | 1 | -8/+21 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | test - e2e-beta - separate notice tests into individual tests | kumavis | 2018-06-14 | 1 | -1/+5 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | test - e2e - clear phishing warning | kumavis | 2018-06-14 | 2 | -1/+7 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | notice-controller - update memStore on boot | kumavis | 2018-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | test - e2e - check for phishing warning | kumavis | 2018-06-14 | 4 | -15/+29 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 12 | -97/+39 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | notices - notices collection is now manually edited | kumavis | 2018-06-14 | 7 | -65/+35 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Add changelog item. | Kevin Serrano | 2018-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Add phishing notice. | Kevin Serrano | 2018-06-14 | 3 | -2/+8 | |
| | | |/ / / / / / | ||||||
| | * | | | | | | | Merge pull request #4513 from MetaMask/ValidateEmptyKey | kumavis | 2018-06-14 | 5 | -18/+77 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Validate empty key | |||||
| | | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-14 | 204 | -1737/+8267 | |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | ValidateEmptyKey | |||||
| | * | | | | | | | | Merge pull request #4570 from MetaMask/persistence-stream-fix | kumavis | 2018-06-14 | 3 | -6/+33 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | background - persistence pipeline - fix persistence bug | |||||
| | | * | | | | | | | | changelog - add note on persistence bug | kumavis | 2018-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | background - persistence pipeline - fix persistence bug | kumavis | 2018-06-14 | 2 | -6/+32 | |
| | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge pull request #4550 from MetaMask/bmd/sign-warning-helplink | bobby dresser | 2018-06-14 | 2 | -1/+14 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | add help link to eth_sign warning | |||||
| | | * | | | | | | | add help link to eth_sign warning | Bobby Dresser | 2018-06-12 | 2 | -1/+14 | |
| | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | | Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fix | Kevin Serrano | 2018-06-14 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | changelog - add note on nonce-lock mutex fix | |||||
| | | * \ \ \ \ \ \ | Merge branch 'develop' into nonce-tracker-mutex-fix | kumavis | 2018-06-13 | 5 | -6532/+6544 | |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | | * | | | | | | | changelog - add note on nonce-lock mutex fix | kumavis | 2018-06-13 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | account-import-strategies - ensure privateKey is prefixed before converting ↵ | kumavis | 2018-06-14 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to buffer | |||||
| | | | | * | | | | | test - unit - add assertRejects to test asyncFns | kumavis | 2018-06-14 | 2 | -5/+23 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | test - unit - import strategies - properly await async methods | kumavis | 2018-06-14 | 1 | -8/+8 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | Make account import tests much more specific | Dan Finlay | 2018-06-12 | 3 | -6467/+6530 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid. | |||||
| | | | | * | | | | | Improve private key import tests | Dan Finlay | 2018-06-08 | 1 | -1/+25 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | Improve test formatting | Dan Finlay | 2018-06-08 | 1 | -16/+19 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | Bump changelog | Dan Finlay | 2018-06-06 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | | | | * | | | | | Add validation for importing empty private key | Dan Finlay | 2018-06-06 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously importing an empty string would result in a new empty Keyring object to be constructed, with no notification to the user. Now we render a clear error explaining the mistake. | |||||
| | | | | | * | | | | Handle brave throws | Dan Finlay | 2018-06-15 | 1 | -3/+11 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | changelog - version fix | kumavis | 2018-06-09 | 1 | -2/+0 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | changelog 4270 | Jenny Pollack | 2018-06-08 | 1 | -0/+3 | |
| | | | | | | | | | | ||||||
| | | | | | * | | | | Merge branch 'develop' into save-brave | Jenny Pollack | 2018-06-08 | 186 | -1530/+8026 | |
| | | | | | |\ \ \ \ | ||||||
| | | | | | * | | | | | lint | Jenny Pollack | 2018-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | | | | * | | | | | remove loglevel | Jenny Pollack | 2018-06-07 | 1 | -2/+1 | |
| | | | | | | | | | | | ||||||
| | | | | | * | | | | | preferred first languauge - check for Brave | Jenny Pollack | 2018-06-07 | 1 | -8/+5 | |
| | | | | | | | | | | | ||||||
| | | | | | * | | | | | first language - add check for brave browser on getAcceptLanguages | Jenny Pollack | 2018-06-07 | 1 | -1/+11 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | use latest eth-trezor-keyring | brunobar79 | 2018-06-26 | 2 | -2/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fixes | brunobar79 | 2018-06-23 | 3 | -6552/+6543 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | point to new version of eth-trezor-keyring | brunobar79 | 2018-06-23 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 ↵ | Bruno | 2018-06-13 | 12 | -6576/+6595 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop | |||||
| | | * | | | | | | | | | Merge pull request #4558 from MetaMask/stop-reload-on-network-change | Dan Finlay | 2018-06-13 | 3 | -65/+20 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Stop reload on network change | |||||
| | | | * \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | Bug: Mutex locks not released on error | |||||
| | | | * | | | | | | | | | 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 unit tests on changes | |||||
| | | | * | | | | | | | | | Add script for auto-re-running tests on change | Dan Finlay | 2018-06-13 | 2 | -6468/+6525 | |
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes. | |||||
| | | * | | | | | | | | | Merge pull request #4554 from whymarrh/fix-e2e-profile-path | Whymarrh Whitby | 2018-06-13 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | Fix temp Chrome profile path used for e2e tests | |||||
| | | | * | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | Fix gas limit editing on confirm screen | |||||
| | | | * | | | | | | | 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 ↵ | Bruno | 2018-06-13 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | into develop | |||||
| | | * | | | | | | | 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. | |||||
| | * | | | | | | | | | | | Fix bug where reset account would not work. | Dan Finlay | 2018-06-07 | 3 | -6/+12 | |
| | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod. | |||||
| * | | | | | | | | | | | Merge pull request #4090 from MetaMask/i3725-refactor-send-component- | Dan J Miller | 2018-06-07 | 163 | -1349/+7527 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | I3725 Refactor Send Component | |||||
| | * | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | CI - Add e2e-beta tests | |||||
| | * | | | | | | | | | | | 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 ↵ | Dan | 2018-06-06 | 2 | -14/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tab openings on installation. | |||||
| | * | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | Block gravityforms.com from web3 injection | Dan Finlay | 2018-06-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3073 | |||||
| | | | | * | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow sending to ganache default accounts on main net | |||||
| | * | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle errors for null selected address after Importing account (json or private key) | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 ↵ | Dan | 2018-05-31 | 4 | -16/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import. | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #4514 from whymarrh/account-label-type-check | kumavis | 2018-06-07 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel | |||||
| | * | | | | | | | | | | | | | | | | 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 Master into Develop | |||||
| | * | | | | | | | | | | | | | | Merge pull request #4511 from MetaMask/v4.7.4 | kumavis | 2018-06-06 | 8 | -49/+102 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.4 | |||||
| | | * | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.3 | |||||
| | | * | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Render accounts in keyring order | |||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit selectedAddress assertion to the wallet view | |||||
| | * | | | | | | | | | | | | | | | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed. | |||||
| | * | | | | | | | | | | | | | | | 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 - add multiple vault detection to diagnostics reporting | |||||
| | * | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props | |||||
| * | | | | | | | | | | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentities | kumavis | 2018-06-05 | 5 | -4/+135 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear unknown identities | |||||
| | * | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user. | |||||
| | * | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long. | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-02 | 1 | -5/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ellipses | |||||
| | | * | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | 4.7.2 - Merge master into develop | |||||
| | * | | | | | | | | | | | Merge pull request #4470 from MetaMask/v4.7.2 | Dan Finlay | 2018-06-04 | 11 | -24/+85 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.2 | |||||
| | | * | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix - update preferences controller identities on keyring controller update | |||||
| | * | | | | | | | | | | | | 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 guide | |||||
| | * | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | 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 Master into Develop | |||||
| | * | | | | | | | | | | | Merge pull request #4449 from MetaMask/Version-4.7.1 | kumavis | 2018-06-02 | 42 | -271/+434 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.1 | |||||
| | | * | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.0 - rc2 | |||||
| | | * | | | | | | | | | | | 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 zendesk | |||||
| | * | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest Yarn for Node >= 10 | |||||
| | * | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | End json-rpc-engine stack on error | |||||
| | * | | | | | | | | | | 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 | |
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | NewUI gas estimation produces same results as old-ui (exception: contract addresses) | |||||
| | | | | | | | * | | | | 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 ↵ | Dan | 2018-06-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ('0' if readOnly). | |||||
| | | | | | | | * | | | | 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 ↵ | Dan | 2018-06-01 | 79 | -550/+2072 | |
| | | | | | | | |\ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation | |||||
| | | | | | | * | | | | | Remove .only | Dan | 2018-06-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-06-01 | 9 | -156/+108 | |
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | |||||
| | | | | | | | * \ \ \ \ | Merge pull request #4386 from ↵ | Dan J Miller | 2018-06-01 | 9 | -156/+108 | |
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput | |||||
| | | | | | | | | * | | | | | 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 ↵ | Alexander Tseung | 2018-06-01 | 16 | -62/+79 | |
| | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style buttons | |||||
| * | | | | | | | | | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controller | kumavis | 2018-05-31 | 2 | -8/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | deps - bump eth-keyring-controller for bugfix | |||||
| | * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Adds account in e2e test | |||||
| | * | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | |||||
| | * | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Pull master changes back into develop | |||||
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-30 | 7 | -23/+72 | |
| |/| | | | | | | | | | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | merge-master | |||||
| | * | | | | | | | | Merge pull request #4384 from antonper/master | kumavis | 2018-05-30 | 3 | -10/+37 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | UI Errors stack cleaned | |||||
| | | * | | | | | | | | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 3 | -19/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more errors traces cleaned up | |||||
| | | * | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | Allow other extensions to connect | |||||
| | | * | | | | | | | 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 | |||||
| | | * | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | transactions - run event emitters outside context of _setTxStatus | |||||
| | | * | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add mission statement v1 | |||||
| | * | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for brave | |||||
| * | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | 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 - update preferences controller addresses after import account | |||||
| | * | | | | | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ↵ | kumavis | 2018-05-29 | 1 | -10/+10 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account | |||||
| * | | | | | | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2e | kumavis | 2018-05-29 | 7 | -12/+1143 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | Basic end-to-end (e2e) tests for the new UI | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |