Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | brunobar79 | 2018-08-09 | 5 | -18/+122 |
| | |||||
* | Merge pull request #4905 from MetaMask/eip-712-deprecation | Dan Finlay | 2018-07-28 | 1 | -0/+5 |
|\ | | | | | EIP-712: deprecation message | ||||
| * | Add deprecation message for eth_signTypedData | bitpshr | 2018-07-28 | 1 | -0/+5 |
| | | |||||
* | | add phishing html page, and redirect to bundled page in-window | Kelvin Tan | 2018-07-27 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #4871 from MetaMask/3519-new-contract-gas | Frankie | 2018-07-26 | 1 | -7/+3 |
|\ | | | | | tx-gas-utils - catch all errors from gas estimation | ||||
| * | tx-gas-utils - catch all errors from gas estimation | Jenny Pollack | 2018-07-25 | 1 | -7/+3 |
| | | |||||
* | | migrations - fix to include 27 | frankiebee | 2018-07-26 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #4825 from MetaMask/no-inject-ani-gamer | William Morriss | 2018-07-25 | 1 | -0/+1 |
|\ \ | | | | | | | Do not inject on ani.gamer.com.tw | ||||
| * \ | Merge branch 'develop' into no-inject-ani-gamer | Kevin Serrano | 2018-07-25 | 11 | -45/+442 |
| |\ \ | |||||
| * | | | Do not inject on ani.gamer.com.tw | Dan Finlay | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #4799 | ||||
* | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 1 | -0/+3 |
| |/ / |/| | | | | | Fixes #4253 | ||||
* | | | Remove unneeded code from i4829-close-notifications-from-ui branch. | Dan Miller | 2018-07-25 | 2 | -2/+1 |
| | | | |||||
* | | | Uncomment closePopupIfOpen code. | Dan Miller | 2018-07-24 | 1 | -3/+3 |
| | | | |||||
* | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 2 | -4/+10 |
| |/ |/| | |||||
* | | run linter | brunobar79 | 2018-07-22 | 2 | -2/+2 |
| | | |||||
* | | fix merge | Esteban MIno | 2018-07-21 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'develop' into detectTokenFeature | Esteban Miño | 2018-07-21 | 17 | -27/+435 |
|\ \ | |||||
| * \ | Merge branch 'develop' into transaction-notifications | Csaba S | 2018-07-21 | 5 | -4/+314 |
| |\ \ | |||||
| | * | | Auto-detect tokens #3034 (#4683) | Esteban Miño | 2018-07-21 | 2 | -1/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog | ||||
| | * | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 4 | -3/+180 |
| | |\ \ | | | | | | | | | | | Initial trezor support | ||||
| | | * | | added some e2e tests | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | added tests for removeAccount | brunobar79 | 2018-07-17 | 1 | -2/+0 |
| | | | | | |||||
| | | * | | added more unit tests | brunobar79 | 2018-07-17 | 1 | -4/+3 |
| | | | | | |||||
| | | * | | added unit tests for metamaskcontroller | brunobar79 | 2018-07-17 | 1 | -3/+17 |
| | | | | | |||||
| | | * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 2 | -13/+1 |
| | | |\| | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 3 | -1/+43 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 1 | -1/+36 |
| | | | | | | |||||
| | | * | | | update to temp dependencies | brunobar79 | 2018-07-12 | 1 | -1/+6 |
| | | | | | | |||||
| | | * | | | account removal is working | brunobar79 | 2018-07-11 | 2 | -1/+39 |
| | | | | | | |||||
| | | * | | | fix trezor label | brunobar79 | 2018-07-10 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | added label for trezor accounts | brunobar79 | 2018-07-10 | 1 | -1/+3 |
| | | | | | | |||||
| | | * | | | fix account duplication | brunobar79 | 2018-07-10 | 1 | -1/+3 |
| | | | | | | |||||
| | | * | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 1 | -4/+15 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 6 | -0/+120 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | | | UI refactor | brunobar79 | 2018-07-06 | 1 | -2/+4 |
| | | | | | | | |||||
| | | * | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -4/+4 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 26 | -50/+50 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | allow to open specific route in fullscreen mode | brunobar79 | 2018-07-03 | 1 | -2/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | fix environment detection regex | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 12 | -59/+162 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | fixes | brunobar79 | 2018-06-23 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | | * | | | | | | | clean up | Bruno | 2018-06-13 | 1 | -16/+19 |
| | | | | | | | | | | |||||
| | | * | | | | | | | fix merge conflicts | Bruno | 2018-06-13 | 6 | -104/+65 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 3 | -1379/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | 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 | 2 | -4/+4 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | 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 | 3 | -1/+1455 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove dropped handler | Csaba Solya | 2018-07-21 | 2 | -11/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add notifications | Csaba Solya | 2018-07-20 | 4 | -30/+71 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | initial test | Csaba Solya | 2018-07-20 | 2 | -0/+30 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #4656 from MetaMask/portal-metamask-ens-test | Dan Finlay | 2018-07-20 | 3 | -36/+45 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add support for .test ENS domains | ||||
| | * | | | | | | | | | Update variable name | bitpshr | 2018-07-19 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Updates for linting | bitpshr | 2018-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Updates | bitpshr | 2018-07-19 | 1 | -33/+37 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add support for .test Ropsten ENS domains | bitpshr | 2018-07-19 | 2 | -2/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentry | Jenny Pollack | 2018-07-19 | 2 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | sentry - add detection for Brave Browser | ||||
| | * | | | | | | | | | remove local tests | Jenny Pollack | 2018-07-19 | 2 | -3/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | sentry - add detection for Brave Browser | Jenny Pollack | 2018-07-19 | 2 | -4/+11 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * / | | | | | | | | Do not inject on blueskybooking.com | Dan Finlay | 2018-07-17 | 1 | -0/+1 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | Per zendesk 2312. | ||||
| * | | | | | | | | Add harbourair.com to injection block list | Dan Finlay | 2018-07-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This site was getting unexpected results when MetaMask was installed. https://consensys.zendesk.com/agent/tickets/2312 | ||||
| * | | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Remove unsued nonce tracker function | ||||
| | * | | | | | | | Merge branch 'develop' into removeNonceTrackerFunction | Thomas | 2018-07-11 | 32 | -57/+176 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Remove unsued nonce tracker function | tmashuang | 2018-06-26 | 1 | -13/+0 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction views | ||||
| | * | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 1 | -10/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 2 | -13/+12 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵ | frankiebee | 2018-07-11 | 32 | -57/+176 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into i#3896 | ||||
| | * | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui | Dan J Miller | 2018-07-05 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use background gas price estimation method in new ui. | ||||
| | | * | | | | | | Use background gas price estimation method in new ui. | Dan | 2018-06-29 | 1 | -0/+1 |
| | | |/ / / / / | |||||
| | * | | | | | | fix lint errors | brunobar79 | 2018-07-04 | 4 | -8/+7 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into HEAD | brunobar79 | 2018-07-04 | 38 | -137/+461 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Conditionally use Promise-based extension API when creating windows | bitpshr | 2018-07-04 | 1 | -4/+4 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Update to support pathnames on IPFS hash | PhyrexTsai | 2018-06-29 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url. You can try the example below: http://phyrextsai.eth/index.html http://phyrextsai.eth/images/phyrex.jpg | ||||
| | * | | | | | Merge branch 'develop' into portal-metamask | PhyrexTsai | 2018-06-01 | 6 | -35/+78 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update ipfs to infura | Yung chieh Tsai | 2018-06-01 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Update default provider | Yung chieh Tsai | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Update lib | Yung chieh Tsai | 2018-05-29 | 2 | -22/+46 |
| | | | | | | | | |||||
| | * | | | | | | Rename files | Yung chieh Tsai | 2018-05-29 | 4 | -60/+57 |
| | | | | | | | | |||||
| | * | | | | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | setTimeout bug fix | MikeCheng1208 | 2018-05-29 | 1 | -2/+5 |
| | | | | | | | | |||||
| | * | | | | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 5 | -0/+92 |
| | | | | | | | | |||||
| * | | | | | | | trandsactions - remove rejected transactions from history | frankiebee | 2018-06-26 | 1 | -0/+6 |
| | | | | | | | | |||||
| * | | | | | | | migration 27 - remove rejected transactions from state | frankiebee | 2018-06-26 | 1 | -0/+35 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | fix detection on submit password | Esteban MIno | 2018-07-21 | 2 | -8/+10 |
| | | | | | | | |||||
* | | | | | | | keyring unlocked detect and unit tests | Esteban MIno | 2018-07-20 | 2 | -19/+25 |
| | | | | | | | |||||
* | | | | | | | detect tokens when submit password and new account selected | Esteban MIno | 2018-07-20 | 1 | -13/+39 |
| | | | | | | | |||||
* | | | | | | | detect tokens through infura | Esteban MIno | 2018-07-13 | 2 | -22/+25 |
| | | | | | | | |||||
* | | | | | | | improve tests | Esteban MIno | 2018-07-12 | 2 | -17/+14 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' into detectTokenFeature | Esteban MIno | 2018-07-04 | 27 | -53/+52 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | eslint --fix . | brunobar79 | 2018-07-03 | 27 | -53/+52 |
| |/ / / / / | |||||
* | | | | | | passtest-lint | Esteban MIno | 2018-07-04 | 1 | -6/+0 |
| | | | | | | |||||
* | | | | | | tests for spec | Esteban MIno | 2018-06-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | network store to detect token | Esteban MIno | 2018-06-28 | 2 | -9/+11 |
| | | | | | | |||||
* | | | | | | detect tokens polling | Esteban MIno | 2018-06-28 | 2 | -0/+105 |
|/ / / / / | |||||
* | | | | | Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553 | Thomas Huang | 2018-06-21 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | set an id to the metamask notification popup | ||||
| * | | | | | set the popup id returned by create promise | vittominacori | 2018-06-18 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | set an id to the metamask notification popup | vittominacori | 2018-06-17 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | notice controller - properly show new notices for non-new users | kumavis | 2018-06-19 | 1 | -3/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #4586 from MetaMask/block-idex-phisher | kumavis | 2018-06-19 | 3 | -15/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add apparent phishing address to block list | ||||
| * | | | | | | lint - fix recipient-blacklist.js | kumavis | 2018-06-16 | 1 | -13/+13 |
| | | | | | | | |||||
| * | | | | | | blacklist - recipient blacklist as js for inline comments | kumavis | 2018-06-16 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Update recipient-blacklist-config.json | kumavis | 2018-06-16 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Add apparent phishing address to block list | Dan Finlay | 2018-06-15 | 1 | -0/+1 |
| |/ / / / / | | | | | | | | | | | | | In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money. | ||||
* / / / / / | Re-enable dapp reload on network change | Dan Finlay | 2018-06-15 | 2 | -0/+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. | ||||
* | | | | | Merge branch 'develop' into save-brave | kumavis | 2018-06-15 | 10 | -144/+119 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | 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 | 2 | -25/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Push new notice on recent phishing incidents | ||||
| | * | | | | | notice-controller - update memStore on boot | kumavis | 2018-06-14 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | test - e2e - check for phishing warning | kumavis | 2018-06-14 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 2 | -24/+8 |
| | | | | | | | |||||
| | * | | | | | notices - notices collection is now manually edited | kumavis | 2018-06-14 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-14 | 15 | -155/+255 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | ValidateEmptyKey | ||||
| | * | | | | | background - persistence pipeline - fix persistence bug | kumavis | 2018-06-14 | 2 | -6/+32 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'develop' into stop-reload-on-network-change | Erik Marks | 2018-06-13 | 5 | -46/+71 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | 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 | 2 | -41/+22 |
| | | | | | | |||||
| * | | | | | account-import-strategies - ensure privateKey is prefixed before converting ↵ | kumavis | 2018-06-14 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | to buffer | ||||
| * | | | | | Make account import tests much more specific | Dan Finlay | 2018-06-12 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid. | ||||
| * | | | | | 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 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' into save-brave | Jenny Pollack | 2018-06-08 | 7 | -7/+69 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBug | Dan Finlay | 2018-06-08 | 2 | -6/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix bug where reset account would not work. | ||||
| | * | | | | | Fix bug where reset account would not work. | Dan Finlay | 2018-06-07 | 2 | -6/+10 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 1 | -0/+1 |
| |\| | | | | |||||
| | * | | | | 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 | 7 | -39/+133 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #4414 from scsaba/recipient-blacklist | kumavis | 2018-06-07 | 3 | -1/+43 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Disallow sending to ganache default accounts on main net | ||||
| | | * | | | | | remove generating blocked accounts and use a config file instead | Csaba Solya | 2018-05-31 | 3 | -18/+20 |
| | | | | | | | | |||||
| | | * | | | | | fix documentation | Csaba Solya | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | adding tests for recipient blacklist checker | Csaba Solya | 2018-05-30 | 2 | -5/+5 |
| | | | | | | | | |||||
| | | * | | | | | adding transaction controller tests | Csaba Solya | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | initial implementation | Csaba Solya | 2018-05-30 | 2 | -1/+41 |
| | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Add account type assertion to PreferencesController#setAccountLabel | Whymarrh Whitby | 2018-06-06 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 7 | -6/+154 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-06-01 | 6 | -35/+78 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | i3914-fix-newui-send-gas-estimation | ||||
| * | | | | | | Auto update gas estimate when to changes. | Dan | 2018-05-31 | 1 | -0/+14 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | 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 |
| |_|_|/ / |/| | | | | |||||
* | | | | | 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 | 4 | -66/+84 |
| | | | | | |||||
* | | | | | add multivault detection to diagnostics reporting | kumavis | 2018-06-06 | 1 | -0/+33 |
| |_|/ / |/| | | | |||||
* | | | | Record identity before deleting it | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Mock notifier in test | Dan Finlay | 2018-06-05 | 1 | -1/+2 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | 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. | ||||
* | | | 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 #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 | 1 | -0/+17 |
|\ \ \ | | | | | | | | | Merge Master into Develop | ||||
| * | | | Version 4.7.1v4.7.1 | Dan Finlay | 2018-06-02 | 1 | -0/+17 |
| | | | | |||||
* | | | | Fix return value of migration 26 when missing KC or PC | Whymarrh Whitby | 2018-06-02 | 1 | -1/+1 |
|/ / / | |||||
* / / | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-30 | 5 | -21/+61 |
|\ \ | | | | | | | | | | merge-master | ||||
| * | | 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 | 1 | -4/+10 |
| |\ \ | | | | | | | | | Allow other extensions to connect | ||||
| | * | | Update: allow other extension to connect | Jakub Stasiak | 2018-04-18 | 1 | -4/+10 |
| | | | | |||||
| * | | | Merge pull request #4140 from MetaMask/v4.6.1 | Thomas Huang | 2018-05-01 | 4 | -40/+40 |
| |\ \ \ | | | | | | | | | | | Version 4.6.1 | ||||
| * | | | | 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 #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 | ||||
* | | | | | 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 | ||||
* | | | | controllers - recent-blocks - pull first historical blocks in parallel | kumavis | 2018-05-22 | 1 | -15/+7 |
| | | | | |||||
* | | | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken) | ||||
* | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 8 | -34/+167 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of https://github.com/Trigalti/metamask-extension ↵ | kumavis | 2018-05-22 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into Trigalti-develop | ||||
| | * | | | | Added trailing comma for eslint | simon | 2018-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added adyen.com to blacklisted domains because postMessages are blocking ↵ | simon | 2018-05-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | card encryption | ||||
| * | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 5 | -33/+97 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move account names out of KeyringController | ||||
| | * | | | | | Fix migration 026 to produce the correct shape for state.identities | Whymarrh Whitby | 2018-05-18 | 1 | -1/+8 |
| | | | | | | | |||||
| | * | | | | | Add migration to move identities from KeyringController | Whymarrh Whitby | 2018-05-17 | 2 | -0/+41 |
| | | | | | | | |||||
| | * | | | | | Add PreferencesController#setAddresses to update ids | Whymarrh Whitby | 2018-05-17 | 2 | -8/+22 |
| | | | | | | | |||||
| | * | | | | | Update AddressBookController to read from preferences store | Whymarrh Whitby | 2018-05-17 | 2 | -22/+8 |
| | | | | | | | |||||
| | * | | | | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -3/+19 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4199 from MetaMask/i3487-provider-errors | Dan Finlay | 2018-05-19 | 2 | -0/+68 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | RPC error middleware for json-rpc-engine | ||||
| | * | | | | Add new json-rpc-engine middleware for improved error handling | bitpshr | 2018-05-14 | 2 | -0/+68 |
| | | | | | | |||||
* | | | | | | docs - jsdoc - fix syntax | kumavis | 2018-05-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 6 | -167/+68 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | scsaba-transaction-history-timestamps | ||||
| * \ \ \ \ | Merge pull request #4146 from MetaMask/sentry-error-like2 | kumavis | 2018-05-17 | 1 | -17/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | sentry - add helper to fully rewrite all error messages | ||||
| | * | | | | | sentry - add helper to fully rewrite all error messages | kumavis | 2018-05-01 | 1 | -17/+25 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | network - remove debugging console.log | kumavis | 2018-05-17 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 4 | -1/+18 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| * | | | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | controllers - network - move default config out of first-time-state | kumavis | 2018-05-03 | 2 | -11/+15 |
| | | | | | | |||||
| * | | | | | network - refactor to remove unnecesary code | kumavis | 2018-05-01 | 3 | -124/+29 |
| | | | | | | |||||
| * | | | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 2 | -14/+0 |
| | | | | | | |||||
| * | | | | | controllers - network - more semantic assert | kumavis | 2018-05-01 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | tx-state-history-helper - use more readable Date.now method | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | fix lint issues | Csaba Solya | 2018-05-10 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | remove unnecessary lib | Csaba Solya | 2018-05-10 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | revert unnecessary change in state manager | Csaba Solya | 2018-05-10 | 1 | -13/+7 |
| | | | | | |||||
* | | | | | add time stamps to transaction history log entries | Csaba Solya | 2018-05-10 | 2 | -16/+28 |
| |/ / / |/| | | | |||||
* | | | | Fix documentation typo | bitpshr | 2018-05-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | transactions - add a nonce check utility for ui use | frankiebee | 2018-05-02 | 2 | -0/+16 |
| | | | | |||||
* | | | | fix - getTxsByMetaData check if the key is in the object not if the value is ↵ | frankiebee | 2018-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | truthy | ||||
* | | | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe | kumavis | 2018-05-01 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Blacklist problematic shopify iFrame | ||||
| * | | | Blacklist problematic shopify iFrame | Bryce Neal | 2018-05-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | sentry - report error-like messages using the obj message | kumavis | 2018-05-01 | 1 | -0/+10 |
| | | | | |||||
* | | | | sentry - wrap report modifiers in a try-catch | kumavis | 2018-05-01 | 1 | -16/+24 |
| | | | | |||||
* | | | | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 2 | -23/+1 |
|\ \ \ \ | |/ / / |/| | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-23 | 11 | -79/+295 |
| |\ \ \ | | | | | | | | | | | | | | | | i-4033-seed-words | ||||
| * | | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 2 | -23/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de. | ||||
* | | | | | Merge pull request #4132 from MetaMask/master | kumavis | 2018-04-30 | 2 | -18/+25 |
|\ \ \ \ \ | | |_|/ / | |/| | | | Master | ||||
| * | | | | guard adainst raven erroring | frankiebee | 2018-04-30 | 2 | -18/+25 |
| | | | | | |||||
* | | | | | Merge pull request #4110 from MetaMask/master | kumavis | 2018-04-28 | 9 | -221/+695 |
|\| | | | | | | | | | | | | | | Develop - Add commits to develop that are already in Master | ||||
| * | | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0 | Thomas Huang | 2018-04-27 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Version 4.6.0 | ||||
| * \ \ \ \ | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 9 | -221/+695 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | docs and file organization for txController | ||||
| | * | | | | | transactions - more docs and clean ups | frankiebee | 2018-04-26 | 6 | -55/+116 |
| | | | | | | | |||||
| | * | | | | | Cleaned up some typos and JSDocs in Transactions | Dan Finlay | 2018-04-24 | 3 | -38/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker | ||||
| | * | | | | | transactions - fix refernces | frankiebee | 2018-04-20 | 2 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 35 | -197/+871 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | meta - transactions - docs yo! | frankiebee | 2018-04-20 | 8 | -73/+351 |
| | | | | | | | |||||
| | * | | | | | fix up - more docs | frankiebee | 2018-04-14 | 3 | -38/+77 |
| | | | | | | | |||||
| | * | | | | | meta - transactions - code clean up and jsDoc | frankiebee | 2018-04-14 | 1 | -41/+109 |
| | | | | | | | |||||
| | * | | | | | transactions - code cleanup | frankiebee | 2018-04-13 | 2 | -58/+59 |
| | | | | | | | |||||
| | * | | | | | transactions - lint fixes | frankiebee | 2018-04-11 | 3 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | meta - transactions - create a transactions dir in controller and move ↵ | frankiebee | 2018-04-11 | 8 | -69/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | relevant files into it |