Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 1 | -1/+0 |
|\ | |||||
| * | re-enabled x-metamask-origin for mascara | frankiebee | 2017-09-28 | 2 | -5/+1 |
| * | platforms: put context for extension in platform extension class | frankiebee | 2017-09-22 | 3 | -2/+4 |
| * | Merge branch 'master' into breakout-mascara | frankiebee | 2017-09-20 | 2 | -4/+10 |
| |\ | |||||
| * | | add context to platform to not have X-Metamask-Origin in mascara | frankiebee | 2017-09-20 | 2 | -1/+2 |
* | | | Merge branch 'master' into new-currency-test | kumavis | 2017-09-28 | 18 | -1114/+746 |
|\ \ \ | |||||
| * \ \ | Merge pull request #2194 from MetaMask/network-controller-refactor | kumavis | 2017-09-28 | 2 | -33/+34 |
| |\ \ \ | |||||
| | * | | | network controller - move _setProvider to bottom | kumavis | 2017-09-28 | 1 | -18/+18 |
| | * | | | network controller - refactor to use _setProvider | kumavis | 2017-09-28 | 1 | -17/+28 |
| | * | | | network - remove getter/setter | kumavis | 2017-09-28 | 1 | -23/+14 |
| | * | | | metamask - improve comment | kumavis | 2017-09-28 | 1 | -2/+1 |
| * | | | | Version 3.10.6 | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| * | | | | Commit to the eth-keyring-controller module | Dan Finlay | 2017-09-28 | 1 | -599/+0 |
| * | | | | Remove dead reference | Dan Finlay | 2017-09-28 | 1 | -1/+0 |
| * | | | | Fix Account Selection | Dan Finlay | 2017-09-28 | 2 | -3/+7 |
| * | | | | account-tracker - remove unused import | kumavis | 2017-09-28 | 1 | -1/+0 |
| * | | | | Merge branch 'master' into direct-block-tracker | kumavis | 2017-09-28 | 9 | -323/+363 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 6 | -319/+356 |
| | |\ \ \ \ | |||||
| | | * | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin... | frankiebee | 2017-09-27 | 2 | -2/+6 |
| | | * | | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra... | frankiebee | 2017-09-27 | 1 | -1/+5 |
| | | * | | | | transactions: make evnt names pretty and eaiser to read | frankiebee | 2017-09-27 | 2 | -11/+11 |
| | | * | | | | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 5 | -13/+23 |
| | | * | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 19 | -254/+430 |
| | | |\ \ \ \ | |||||
| | | * | | | | | ensure that values written to txParams are hex strings | frankiebee | 2017-09-14 | 2 | -1/+10 |
| | | * | | | | | linting && format fixing | frankiebee | 2017-09-13 | 2 | -12/+7 |
| | | * | | | | | match other controller patterns | frankiebee | 2017-09-13 | 3 | -23/+22 |
| | | * | | | | | fix miss type | frankiebee | 2017-09-09 | 1 | -1/+1 |
| | | * | | | | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 2 | -11/+10 |
| | | * | | | | | fix messy merge | frankiebee | 2017-09-07 | 1 | -4/+4 |
| | | * | | | | | remove unused variable | frankiebee | 2017-09-07 | 1 | -1/+0 |
| | | * | | | | | fix merge and errors disaperaing on update | frankiebee | 2017-09-07 | 2 | -3/+6 |
| | | * | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-07 | 8 | -54/+233 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | add better comments | frankiebee | 2017-09-06 | 2 | -32/+41 |
| | | * | | | | | | rename tx-utils.js -> tx-gas-utils.js | frankiebee | 2017-09-06 | 1 | -4/+0 |
| | | * | | | | | | remove #buildEthTxFromParams | frankiebee | 2017-09-06 | 1 | -17/+0 |
| | | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-08-22 | 7 | -14/+111 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Create TxStateManager | frankiebee | 2017-08-22 | 3 | -47/+47 |
| | | * | | | | | | | Create tests for TxStateManager | frankiebee | 2017-08-19 | 2 | -192/+218 |
| | * | | | | | | | | Fix accountTracker store references | Dan Finlay | 2017-09-28 | 2 | -2/+2 |
| | * | | | | | | | | Version 3.10.5 | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| | * | | | | | | | | Fix bug where block gas limit was incorrectly parsed. | Dan Finlay | 2017-09-28 | 1 | -1/+3 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | style - small whitespace nitpick | kumavis | 2017-09-28 | 1 | -1/+1 |
| * | | | | | | | | account-tracker - use new block-tracker block format | kumavis | 2017-09-28 | 1 | -4/+2 |
| |/ / / / / / / | |||||
| * | | | | | | | Version 3.10.4v3.10.4 | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 9 | -74/+242 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut... | kumavis | 2017-09-27 | 7 | -40/+642 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Remove duplicate instantiation of account-tracker | Dan Finlay | 2017-09-27 | 1 | -5/+1 |
| | | * | | | | | | Move obs store into account-tracker instead of inheriting | Dan Finlay | 2017-09-27 | 4 | -20/+25 |
| | | * | | | | | | Restore blockGasLimit to account-tracker | Dan Finlay | 2017-09-27 | 1 | -0/+3 |
| | | * | | | | | | Pass blocktracker to balances controller | Dan Finlay | 2017-09-27 | 1 | -0/+1 |
| | | * | | | | | | Make encryptor configurable for keyring-controller | Dan Finlay | 2017-09-26 | 1 | -1/+1 |
| | | * | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Make blockTracker an independent param | Dan Finlay | 2017-09-26 | 2 | -3/+6 |
| | | * | | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-09-26 | 2 | -0/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 2 | -0/+2 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Implemented feedback | Dan Finlay | 2017-09-26 | 2 | -7/+5 |
| | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Made some requested changes | Dan Finlay | 2017-09-26 | 1 | -7/+7 |
| | * | | | | | | | | | Remove keyring controller from project | Dan Finlay | 2017-09-23 | 3 | -596/+2 |
| | * | | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringController | Dan Finlay | 2017-09-23 | 7 | -58/+217 |
| | |\| | | | | | | | | |||||
| | | * | | | | | | | | Fix accont-tracker merge bug | Dan Finlay | 2017-09-23 | 1 | -0/+4 |
| | | * | | | | | | | | Fix account-tracker references | Dan Finlay | 2017-09-23 | 3 | -13/+13 |
| | | * | | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 12 | -172/+178 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Fix computed-balances controller reference | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | * | | | | | | | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 4 | -16/+22 |
| | | * | | | | | | | | Remove dead code from eth-store | Dan Finlay | 2017-09-23 | 1 | -43/+1 |
| | | * | | | | | | | | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 4 | -7/+17 |
| | | * | | | | | | | | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 3 | -81/+69 |
| | | * | | | | | | | | Add state-labeled events to allow subscribing to any transaction's state change | Dan Finlay | 2017-09-14 | 1 | -0/+1 |
| | | * | | | | | | | | Some progress | Dan Finlay | 2017-09-13 | 3 | -1/+143 |
| | | * | | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController | Dan Finlay | 2017-09-12 | 1 | -0/+51 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Linted | Dan Finlay | 2017-09-08 | 1 | -2/+1 |
| | | | * | | | | | | | | Make tx calculations account for gas prices | Dan Finlay | 2017-09-08 | 1 | -2/+8 |
| | | | * | | | | | | | | Remove logs | Dan Finlay | 2017-09-08 | 1 | -8/+0 |
| | | | * | | | | | | | | Fix balance calc test | Dan Finlay | 2017-09-08 | 1 | -0/+2 |
| | | | * | | | | | | | | Add constructor comment | Dan Finlay | 2017-09-08 | 1 | -0/+5 |
| | | | * | | | | | | | | Fix valueFor test | Dan Finlay | 2017-09-08 | 1 | -7/+8 |
| | | | * | | | | | | | | Add basic test for valueFor | Dan Finlay | 2017-09-08 | 1 | -4/+9 |
| | | | * | | | | | | | | test not passing | Dan Finlay | 2017-09-08 | 1 | -1/+17 |
| | | | * | | | | | | | | Check balances in parallel | Dan Finlay | 2017-09-07 | 1 | -1/+8 |
| | | | * | | | | | | | | Add first passing balance calc test | Dan Finlay | 2017-09-07 | 1 | -0/+18 |
| | * | | | | | | | | | | Allow metamaskController to define keyring types | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | network contoller - clean up unused code | frankiebee | 2017-09-27 | 1 | -6/+0 |
| * | | | | | | | | | | listen for the blocke event on the block tracker instead of rawBlock on the p... | frankiebee | 2017-09-27 | 2 | -2/+1 |
| * | | | | | | | | | | wrap block tracker in events proxy | frankiebee | 2017-09-27 | 2 | -14/+39 |
| * | | | | | | | | | | metamask - use provider-engines block tracker | kumavis | 2017-09-23 | 1 | -1/+1 |
| * | | | | | | | | | | bug - fix event emitter mem leak warning | kumavis | 2017-09-22 | 1 | -3/+8 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-27 | 3 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2143 from MetaMask/Version-3.10.3 | kumavis | 2017-09-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Version 3.10.3 | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Define encryptor in constructor params instead of platform object | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into ConfigurableEncryption | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
| |\| | | | | | | | |||||
| * | | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll... | Dan Finlay | 2017-09-22 | 2 | -2/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-21 | 2 | -4/+10 |
|\| | | | | | | | |||||
| * | | | | | | | v3.10.2 | kumavis | 2017-09-19 | 1 | -1/+1 |
| * | | | | | | | Do not mark a retry tx failed that has been broadcast successfully | Dan Finlay | 2017-09-19 | 1 | -3/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Version 3.10.1v3.10.1 | Dan Finlay | 2017-09-19 | 1 | -1/+1 |
* | | | | | | | Comply with current currency API and add additional styling. | Kevin Serrano | 2017-09-19 | 1 | -2/+2 |
* | | | | | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-19 | 10 | -169/+169 |
|\| | | | | | | |||||
| * | | | | | | createOriginMiddleware - fix var name | kumavis | 2017-09-14 | 1 | -1/+1 |
| * | | | | | | metamask controller - destroy filter polyfill on disconnect | kumavis | 2017-09-14 | 1 | -4/+10 |
| * | | | | | | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 4 | -34/+44 |
| * | | | | | | debug - prefer logger over console | kumavis | 2017-09-14 | 2 | -9/+9 |
| * | | | | | | metamask cont - standardize multiplex stream naming | kumavis | 2017-09-14 | 1 | -8/+8 |
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-13 | 1 | -1/+1 |
| |\| | | | | | |||||
| * | | | | | | contentscript - fix obj-multiplex instantiation and use pump for streams | kumavis | 2017-09-12 | 1 | -12/+33 |
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-12 | 2 | -12/+15 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | inpage - use obj-multiplex module | kumavis | 2017-09-08 | 1 | -6/+6 |
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-08 | 4 | -26/+47 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | lint - remove dead code | kumavis | 2017-09-08 | 1 | -1/+0 |
| * | | | | | | | | metamask - add jsonrpc filter middleware on per-connection engine | kumavis | 2017-09-08 | 1 | -2/+8 |
| * | | | | | | | | inpage - distinguish pump vs pipe | kumavis | 2017-09-08 | 1 | -4/+4 |
| * | | | | | | | | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 4 | -80/+41 |
| * | | | | | | | | inpage - add idRemapMiddleware | kumavis | 2017-09-08 | 1 | -1/+3 |
| * | | | | | | | | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 2 | -46/+42 |
* | | | | | | | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-14 | 4 | -30/+33 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Version 3.10.0v3.10.0 | Dan Finlay | 2017-09-12 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissions | Kevin Serrano | 2017-09-11 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove cryptonator from chrome permissions. | Kevin Serrano | 2017-09-08 | 1 | -3/+2 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #2057 from MetaMask/Version-3.9.13 | kumavis | 2017-09-09 | 2 | -26/+28 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Version 3.9.13v3.9.13 | Dan Finlay | 2017-09-09 | 1 | -1/+1 |
| | * | | | | | | inpage provider - define sendAsync on the prototype | kumavis | 2017-09-09 | 1 | -25/+27 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-07 | 2 | -3/+4 |
| |\| | | | | | |||||
| | * | | | | | Version 3.9.12v3.9.12 | Dan Finlay | 2017-09-07 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | inpage - bug fix | kumavis | 2017-09-06 | 1 | -2/+3 |
| * | | | | | Properly update keyring state on new account addition. | Kevin Serrano | 2017-09-07 | 1 | -1/+2 |
| |/ / / / | |||||
| * | | | | Make web3 deprecation notice more useful | Dan Finlay | 2017-09-06 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-08-30 | 2 | -22/+44 |
|\| | | | | |||||
| * | | | | Merge branch 'master' into inpage-provider-fixes | kumavis | 2017-08-29 | 6 | -34/+140 |
| |\| | | | |||||
| * | | | | inpage - lint fix | kumavis | 2017-08-29 | 1 | -1/+1 |
| * | | | | inpage provider - autoreload - improve readability | kumavis | 2017-08-24 | 1 | -15/+32 |
| * | | | | inpage provider - only warn web3 usage once per session | kumavis | 2017-08-24 | 1 | -6/+11 |
| * | | | | inpage provider - sync rpc - default to null values | kumavis | 2017-08-24 | 1 | -3/+3 |
* | | | | | integrate infura currency | Kevin Serrano | 2017-08-30 | 2 | -4/+4 |
| |/ / / |/| | | | |||||
* | | | | Version 3.9.11v3.9.11 | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
* | | | | Merge pull request #1973 from MetaMask/hotfix-migration019 | kumavis | 2017-08-24 | 3 | -1/+85 |
|\ \ \ \ | |||||
| * | | | | fall back to `latest` if blockNumber is null | frankiebee | 2017-08-24 | 1 | -1/+1 |
| * | | | | Make method return a number | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| * | | | | Only cancel pending txs with non continuously high nonces | Dan Finlay | 2017-08-24 | 1 | -1/+24 |
| * | | | | fix description | frankiebee | 2017-08-24 | 1 | -2/+2 |
| * | | | | hotfix - fail submitted txs whos nonce is out of bound | frankiebee | 2017-08-24 | 2 | -0/+61 |
* | | | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 2 | -2/+12 |
|/ / / / | |||||
* | | | | Enforce nonces as type string | Dan Finlay | 2017-08-24 | 1 | -2/+10 |
* | | | | Use toNumber method | Dan Finlay | 2017-08-24 | 1 | -2/+1 |
* | | | | Fix network nonce parsing | Dan Finlay | 2017-08-24 | 1 | -4/+11 |
* | | | | Pass nonce tests | Dan Finlay | 2017-08-24 | 1 | -8/+7 |
* | | | | Got all tests but one passing | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
* | | | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 1 | -26/+24 |
* | | | | Linted | Dan Finlay | 2017-08-24 | 1 | -1/+0 |
* | | | | Simplify nonce calculation | Dan Finlay | 2017-08-24 | 1 | -4/+5 |
|/ / / | |||||
* | | | Version 3.9.10 | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
* | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 5 | -17/+110 |
|\ \ \ | | |/ | |/| | |||||
| * | | Version 3.9.9v3.9.9 | Dan Finlay | 2017-08-19 | 1 | -1/+1 |
| * | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 4 | -16/+109 |
| |\ \ | |||||
| | * | | migration 18 - activate | kumavis | 2017-08-15 | 1 | -0/+1 |
| | * | | migration 18 - fix an oops | kumavis | 2017-08-15 | 1 | -1/+1 |
| | * | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 3 | -3/+2 |
| | * | | migration 18 - move to diff-based history | kumavis | 2017-08-15 | 1 | -0/+52 |
| | * | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 2 | -15/+56 |
* | | | | nonce-tracker - more debugging numbers for nonceDetails | kumavis | 2017-08-23 | 1 | -10/+8 |
* | | | | remove unused code | kumavis | 2017-08-23 | 1 | -15/+0 |
* | | | | nonce-tracker - use ethjs-query | kumavis | 2017-08-23 | 1 | -11/+2 |
* | | | | nonce-tracker - fix var name | kumavis | 2017-08-23 | 1 | -4/+4 |
* | | | | nonce-tracker - getlocalNextNonce - add entry to nonceDetails | kumavis | 2017-08-23 | 1 | -1/+1 |
* | | | | nonce-tracker - simplify _getlocalNextNonce | kumavis | 2017-08-23 | 1 | -20/+29 |
* | | | | nonce-tracker - simplify getHighestNonce | kumavis | 2017-08-23 | 1 | -5/+3 |
* | | | | nonce-tracker - getHighestNonce doesnt need uniqued input | kumavis | 2017-08-23 | 1 | -4/+4 |
* | | | | nonce-tracker - make nonce strategy api and naming more symmetical | kumavis | 2017-08-23 | 1 | -19/+21 |
* | | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -5/+4 |
* | | | | clean up code | frankiebee | 2017-08-22 | 1 | -39/+43 |
* | | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -11/+38 |
* | | | | break out network nonce calc. | frankiebee | 2017-08-19 | 1 | -17/+21 |
* | | | | fix 0x0 nonce calc. | frankiebee | 2017-08-19 | 1 | -8/+18 |
* | | | | include pendingTxs in localNonce | frankiebee | 2017-08-19 | 1 | -10/+9 |
* | | | | use "localNonce" when the network returns a nonce that is lower then a known ... | frankiebee | 2017-08-19 | 2 | -3/+27 |
|/ / / | |||||
* | | | Version 3.9.8v3.9.8 | Dan Finlay | 2017-08-17 | 1 | -1/+1 |
* | | | v3.9.7 | kumavis | 2017-08-16 | 1 | -1/+1 |
|/ / | |||||
* | | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
* | | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
|/ | |||||
* | 3.9.6 | kumavis | 2017-08-10 | 1 | -1/+1 |
* | Merge pull request #1883 from MetaMask/estimateGas-fix | Thomas Huang | 2017-08-10 | 1 | -3/+11 |
|\ | |||||
| * | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
* | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 1 | -0/+5 |
|/ | |||||
* | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
* | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
* | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
* | Merge pull request #1880 from MetaMask/pendingFix | Frankie | 2017-08-09 | 2 | -3/+4 |
|\ | |||||
| * | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| * | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 2 | -3/+2 |
* | | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 4 | -186/+241 |
|\| | |||||
| * | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 |
| * | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 |
| * | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 4 | -5/+19 |
| |\ | |||||
| * | | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
| * | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| * | | fix spelling | frankiebee | 2017-08-08 | 2 | -15/+12 |
| * | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 12 | -125/+118 |
| |\ \ | |||||
| * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 |
| * | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 |
| * | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 |
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-08 | 5 | -6/+21 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 2 | -3/+4 |
| |\ \ \ | |||||
| | * | | | v3.9.5 | kumavis | 2017-08-05 | 1 | -1/+1 |
| | * | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -2/+3 |
| * | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | v3.9.4 | kumavis | 2017-08-04 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 4 | -35/+21 |
| |\| | | |||||
| | * | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 1 | -1/+2 |
| | * | | | v3.9.3 | kumavis | 2017-08-04 | 1 | -1/+1 |
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r... | kumavis | 2017-08-04 | 1 | -3/+0 |
| | |\ \ \ | |||||
| | * | | | | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 2 | -33/+18 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 2 | -2/+15 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Create distinct responsive 'home.html' file, hard-code popup.html size | Dan Finlay | 2017-07-29 | 2 | -1/+13 |
| | * | | | Correct viewport param | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | * | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -40/+95 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -34/+104 |
| | |\ \ \ \ | |||||
| | * | | | | | Disable user zoom in mobile mode | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | * | | | | | Fix viewport width to 1 | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | * | | | | | Adjust mobile scale for smaller devices | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| | * | | | | | Set initial scale for mobile. | Dan Finlay | 2017-07-27 | 1 | -1/+2 |
| | * | | | | | Replace ui with responsive-ui | Dan Finlay | 2017-07-25 | 3 | -95/+0 |
| | * | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-21 | 12 | -156/+364 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 4 | -4/+4 |
| | * | | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-06 | 2 | -3/+10 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Get duplicate UI template working | Dan Finlay | 2017-07-04 | 2 | -6/+3 |
| | * | | | | | | | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 4 | -3/+57 |
| | * | | | | | | | Began creating new UI template | Dan Finlay | 2017-07-04 | 3 | -1/+46 |
| * | | | | | | | | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 4 | -247/+191 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
| | * | | | | | | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 4 | -51/+49 |
| | * | | | | | | lint fixes | frankiebee | 2017-08-02 | 3 | -11/+4 |
| | * | | | | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 8 | -21/+126 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | * | | | | | | fix addTxDefaults | frankiebee | 2017-08-02 | 2 | -2/+3 |
| | * | | | | | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 3 | -218/+168 |
| * | | | | | | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 4 | -47/+67 |
| * | | | | | | | phishing detection - move phishing detection into contentscript and metamask ... | kumavis | 2017-08-03 | 7 | -64/+50 |
| * | | | | | | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Do not blacklist files | Dan Finlay | 2017-07-28 | 1 | -1/+0 |
| * | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 2 | -2/+41 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge pull request #1837 from MetaMask/i1833-levencheck | Dan Finlay | 2017-07-27 | 1 | -8/+36 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Give credit where it is due | Kevin Serrano | 2017-07-27 | 1 | -0/+4 |
| | | * | | | | | Add levenshtein logic to blacklister. | Kevin Serrano | 2017-07-27 | 1 | -8/+32 |
| * | | | | | | | Live update blacklist from Infura | Dan Finlay | 2017-07-27 | 4 | -13/+15 |
| * | | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 3 | -7/+13 |
| |\| | | | | | | |||||
| | * | | | | | | Version 3.9.2v3.9.2 | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 2 | -5/+11 |
| | * | | | | | nonce-tracker - add raw baseNonceHex to nonceDetails | kumavis | 2017-07-27 | 1 | -1/+1 |