Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add optional version field to notices | Dan Finlay | 2017-11-29 | 2 | -1/+20 |
* | Merge pull request #2441 from MetaMask/kumavis-patch-3 | Dan Finlay | 2017-11-28 | 1 | -1/+1 |
|\ | |||||
| * | network controller - warn via log.warn | kumavis | 2017-11-28 | 1 | -1/+1 |
| * | Update network.js | kumavis | 2017-10-24 | 1 | -1/+1 |
* | | Prevent creation of multiple vaults | Dan Finlay | 2017-11-21 | 1 | -31/+20 |
* | | Add reproduction and mutex code | Dan Finlay | 2017-11-21 | 1 | -2/+37 |
* | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error | Thomas Huang | 2017-11-21 | 1 | -0/+7 |
|\ \ | |||||
| * | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 1 | -0/+7 |
* | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
* | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 20 | -64/+209 |
|\ \ \ | |||||
| * | | | 3.12.0v3.12.0 | kumavis | 2017-10-26 | 1 | -1/+1 |
| * | | | Resolving that ugly merge. | Kevin Serrano | 2017-10-26 | 1 | -3/+7 |
| * | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 13 | -31/+30 |
| |\ \ \ | |||||
| | * | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 13 | -31/+30 |
| * | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 1 | -0/+76 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 1 | -0/+76 |
| | |/ / | |||||
| * | | | Try to fix intermittent test failure in NonceTracker tests | Dan Finlay | 2017-10-23 | 1 | -0/+4 |
| * | | | Version 3.11.2v3.11.2 | Dan Finlay | 2017-10-22 | 1 | -1/+1 |
| |/ / | |||||
| * | | Version 3.11.1v3.11.1 | Dan Finlay | 2017-10-21 | 1 | -1/+1 |
| * | | Linted | Dan Finlay | 2017-10-20 | 2 | -2/+1 |
| * | | Fix bug where new account was not immediately selected | Dan Finlay | 2017-10-20 | 1 | -3/+14 |
| * | | Allow computed balances to enumerate its own view | Dan Finlay | 2017-10-20 | 1 | -2/+3 |
| * | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 1 | -1/+0 |
| * | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 6 | -90/+72 |
| |\ \ | |||||
| | * | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 6 | -90/+72 |
| * | | | Make account tracking much more reactive | Dan Finlay | 2017-10-19 | 2 | -12/+13 |
| * | | | Make account tracking more reactive | Dan Finlay | 2017-10-19 | 3 | -29/+33 |
| * | | | Refresh computed balances controller when restoring vault | Dan Finlay | 2017-10-19 | 2 | -1/+6 |
| * | | | Add validation to balance constructor | Dan Finlay | 2017-10-19 | 1 | -0/+10 |
| * | | | Stop tracking old account balances after restore vault | Dan Finlay | 2017-10-19 | 1 | -0/+13 |
| * | | | Promisify metamask-controller vault creating methods | Dan Finlay | 2017-10-18 | 1 | -17/+10 |
| * | | | Select first account when restoring seed | Dan Finlay | 2017-10-18 | 1 | -3/+17 |
| * | | | Select first account on new vault creation | Dan Finlay | 2017-10-18 | 1 | -1/+12 |
| |/ / | |||||
| * | | contentscript - fix inpage require and bundling | kumavis | 2017-10-13 | 1 | -4/+4 |
| * | | Break up inpage file read into multiple lines | Dan Finlay | 2017-10-13 | 1 | -1/+3 |
| * | | Merge branch 'master' into i1340-SynchronousInjection | Dan Finlay | 2017-10-13 | 12 | -80/+317 |
| |\ \ | |||||
| | * \ | Merge pull request #2345 from MetaMask/Version-3.11.0 | Thomas Huang | 2017-10-13 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Version 3.11.0v3.11.0 | Dan Finlay | 2017-10-12 | 1 | -1/+1 |
| | * | | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 2 | -7/+4 |
| | * | | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 1 | -3/+4 |
| | * | | | util - add obj-proxy | kumavis | 2017-10-11 | 1 | -0/+19 |
| | * | | | events-proxy - clean up | kumavis | 2017-10-11 | 1 | -5/+5 |
| | * | | | lint fixes | kumavis | 2017-10-11 | 2 | -8/+3 |
| | * | | | network controller - refactor to use eth-rpc-client | kumavis | 2017-10-11 | 2 | -29/+34 |
| | * | | | metamask controller - define this.newTransaction to ease instantiation order | kumavis | 2017-10-11 | 1 | -1/+6 |
| | * | | | metamask controller - simplify provider init | kumavis | 2017-10-11 | 1 | -22/+16 |
| | * | | | metamask controller - breakout getAccounts method | kumavis | 2017-10-11 | 1 | -12/+14 |
| | |/ / | |||||
| * | / | Begin implementing sync injection idea | Dan Finlay | 2017-10-05 | 1 | -2/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-10 | 7 | -4/+221 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #2223 from ukstv/master | Dan Finlay | 2017-10-10 | 3 | -1/+182 |
| |\ \ | |||||
| | * | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 1 | -0/+4 |
| | * | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-07 | 3 | -1/+29 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'Version-3.10.9' into SignTypedData | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -4/+6 |
| | |\ \ \ \ | |||||
| | * | | | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 2 | -4/+20 |
| | * | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -6/+7 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 9 | -80/+83 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 3 | -1/+162 |
| * | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | lint fix - nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| | * | | | | | | nodeify - allow callback to be optional | kumavis | 2017-10-07 | 1 | -2/+10 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit | kumavis | 2017-10-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Check status of pending transactions on startup | Dan Finlay | 2017-10-07 | 1 | -0/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | When checking pending txs, check for successful txs with same nonce. | Dan Finlay | 2017-10-07 | 1 | -0/+20 |
| * | | | | | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 2 | -1/+8 |
| |/ / / / / | |||||
* | | | | | | Make the function callback friendly. | Kevin Serrano | 2017-10-10 | 1 | -4/+4 |
* | | | | | | Simplify try catch | Kevin Serrano | 2017-10-06 | 1 | -4/+2 |
* | | | | | | Catch an error if this is not defined. | Kevin Serrano | 2017-10-06 | 1 | -1/+8 |
* | | | | | | Merge branch 'master' into version-debugging | Kevin Serrano | 2017-10-06 | 3 | -5/+7 |
|\| | | | | | |||||
| * | | | | | Version 3.10.9v3.10.9 | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | "fix" hours for message | frankiebee | 2017-10-06 | 1 | -1/+2 |
| * | | | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 2 | -4/+5 |
| |/ / / | |||||
* | | | | Configured for callback-required function.' | Kevin Serrano | 2017-10-05 | 1 | -2/+2 |
* | | | | Include OS version | Kevin Serrano | 2017-10-05 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #2250 from interfect/master | Frankie | 2017-10-04 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Don't pass origin as an HTTP header | Adam Novak | 2017-10-02 | 1 | -1/+0 |
* | | | | pending tx tracker - on tx:warn append error message instead of error obj | kumavis | 2017-10-03 | 1 | -1/+1 |
* | | | | pending tx tracker - tx:warning event includes err obj | kumavis | 2017-10-03 | 1 | -2/+2 |
* | | | | pending tx tracker - resubmit - warn dont error on unknown error | kumavis | 2017-10-03 | 1 | -2/+5 |
* | | | | pending tx tracker - dont throw on load failure | kumavis | 2017-10-03 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 2 | -2/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into history-notes | frankiebee | 2017-10-03 | 2 | -2/+4 |
| |\ \ \ | |||||
| | * | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 2 | -2/+3 |
| | * | | | Merge pull request #2138 from sunify/fix-firefox-cors | Thomas Huang | 2017-10-03 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Update manifest.json | Kevin Serrano | 2017-10-03 | 1 | -2/+1 |
| | | * | | Wildcard for infura.io permissions, added permission for cryptonator api | Alex Lunyov | 2017-09-22 | 1 | -4/+2 |
| | | * | | Fix CORS issues in FireFox | Alex Lunyov | 2017-09-21 | 1 | -1/+5 |
* | | | | | tx state history - append note to first op of diff | kumavis | 2017-10-03 | 1 | -2/+5 |
|/ / / / | |||||
* / / / | transaction - provide notes for history | frankiebee | 2017-10-03 | 2 | -12/+14 |
|/ / / | |||||
* | | | Version 3.10.8 - Fix Currency Conversionv3.10.8 | Dan Finlay | 2017-09-30 | 2 | -2/+2 |
* | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions | kumavis | 2017-09-30 | 3 | -26/+1 |
|\ \ \ | |||||
| * | | | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 3 | -26/+1 |
* | | | | Merge pull request #2239 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | network - make network controller internal network switching explicit | kumavis | 2017-09-30 | 1 | -2/+3 |
* | | | | | Merge pull request #2237 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 3 | -36/+47 |
|\| | | | | |||||
| * | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 3 | -7/+3 |
| * | | | | network controller - small refactor | kumavis | 2017-09-30 | 2 | -35/+50 |
| |/ / / | |||||
* / / / | Version 3.10.7v3.10.7 | Dan Finlay | 2017-09-30 | 1 | -1/+1 |
|/ / / | |||||
* | / | Ensure selected account is always set if possible | Dan Finlay | 2017-09-30 | 1 | -0/+9 |
| |/ |/| | |||||
* | | 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 |
|/ / / |