Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 3.11.2v3.11.2 | Dan Finlay | 2017-10-22 | 2 | -1/+6 |
* | Merge pull request #2423 from MetaMask/json-rpc-fix | Thomas Huang | 2017-10-22 | 1 | -1/+1 |
|\ | |||||
| * | Temporarily reversal of json-rpc-engine | Kevin Serrano | 2017-10-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2419 from MetaMask/Version-3.11.1 | Thomas Huang | 2017-10-21 | 2 | -1/+3 |
|\ | |||||
| * | Version 3.11.1v3.11.1 | Dan Finlay | 2017-10-21 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #2401 from MetaMask/filter-fix-maybe | Frankie | 2017-10-21 | 2 | -1/+2 |
|\ | |||||
| * | changelog entry for filter fix | kumavis | 2017-10-21 | 1 | -0/+1 |
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-10-21 | 8 | -32/+99 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2412 from MetaMask/x-frame-options | kumavis | 2017-10-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | mascara - set x-frame-options header to DENY | frankiebee | 2017-10-20 | 1 | -1/+1 |
* | | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-21 | 7 | -29/+96 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-20 | 1 | -2/+2 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #2409 from chikeichan/fix-account-creation | kumavis | 2017-10-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update eth-keyring-controller dependency | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 | Kevin Serrano | 2017-10-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix(package): update react-simple-file-input to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 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 |
| | * | | Patch sandwich-expando for security update | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
| | * | | Fix bug that breaks ui dev mode | Dan Finlay | 2017-10-19 | 1 | -1/+6 |
| | * | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 2 | -2/+1 |
| | * | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 12 | -105/+97 |
| | |\ \ | |_|/ / |/| | | | |||||
| | * | | 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 |
| | * | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-18 | 9 | -66/+6 |
| | |\ \ | |||||
| | * | | | Bump changelog | Dan Finlay | 2017-10-18 | 1 | -0/+1 |
| | * | | | 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 |
| |/ / / | |||||
| | | * | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | * | deps - bump eth-json-rpc-filters | kumavis | 2017-10-19 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #2396 from MetaMask/revert-2318-network-controller-client | Kevin Serrano | 2017-10-19 | 11 | -105/+96 |
|\ \ \ | |||||
| * | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 11 | -105/+96 |
|/ / / | |||||
* | | | Merge pull request #2387 from watilde/fixes-2208 | Kevin Serrano | 2017-10-19 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Increase line-height for account nicknames | Daijiro Wachi | 2017-10-18 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration | Kevin Serrano | 2017-10-17 | 8 | -65/+4 |
|\ \ | |||||
| * | | Move etherscan link logic into module | Dan Finlay | 2017-10-14 | 8 | -65/+4 |
| |/ | |||||
* | | Merge pull request #2379 from MetaMask/FixImportedTypedDataSigning | Kevin Serrano | 2017-10-17 | 2 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Bump changelog | Dan Finlay | 2017-10-16 | 1 | -0/+1 |
| * | Bump version on eth-simple-keyring | Dan Finlay | 2017-10-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2352 from MetaMask/i1340-SynchronousInjection | kumavis | 2017-10-13 | 3 | -5/+13 |
|\ | |||||
| * | 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 |
| * | Increase build readability | Dan Finlay | 2017-10-13 | 1 | -2/+7 |
| * | Merge branch 'master' into i1340-SynchronousInjection | Dan Finlay | 2017-10-13 | 41 | -217/+742 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2345 from MetaMask/Version-3.11.0 | Thomas Huang | 2017-10-13 | 2 | -2/+4 |
|\ \ | |||||
| * | | Version 3.11.0v3.11.0 | Dan Finlay | 2017-10-12 | 2 | -2/+4 |
* | | | Merge pull request #2318 from MetaMask/network-controller-client | Frankie | 2017-10-12 | 11 | -96/+105 |
|\ \ \ | |/ / |/| | | |||||
| * | | deps - bump eth-rpc-client for fix | kumavis | 2017-10-12 | 1 | -1/+1 |
| * | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 3 | -10/+8 |
| * | | ui - network - fix localhost active status | kumavis | 2017-10-11 | 1 | -1/+1 |
| * | | network - convert localhost from custom rpc to network type | kumavis | 2017-10-11 | 0 | -0/+0 |
| * | | test - integration - intercept reload attempts | kumavis | 2017-10-11 | 1 | -0/+3 |
| * | | deps - bump eth-json-rpc-middleware for fix | kumavis | 2017-10-11 | 1 | -1/+1 |
| * | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 3 | -25/+11 |
| * | | 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 | 3 | -29/+36 |
| * | | 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 |
* | | | Merge pull request #2344 from MetaMask/FixTokenHelpLink | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix link to token support page | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
|/ / | |||||
* | | Merge pull request #2296 from MetaMask/precision-fix | Dan Finlay | 2017-10-10 | 2 | -4/+45 |
|\ \ | |||||
| * | | Make modification | Kevin Serrano | 2017-10-10 | 1 | -1/+1 |
| * | | Fix to actually fail in earlier versions. | Kevin Serrano | 2017-10-10 | 1 | -5/+7 |
| * | | Add test to look for wei precision. | Kevin Serrano | 2017-10-10 | 1 | -0/+36 |
| * | | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-10 | 7 | -8/+97 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-06 | 2 | -1/+4 |
| |\ \ \ | |||||
| * | | | | Fix precision to account for small wei increase. | Kevin Serrano | 2017-10-06 | 1 | -4/+7 |
* | | | | | Merge pull request #2223 from ukstv/master | Dan Finlay | 2017-10-10 | 13 | -12/+397 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | More appropriate styling | Sergey Ukustov | 2017-10-08 | 1 | -1/+2 |
| * | | | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 2 | -1/+5 |
| * | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-07 | 5 | -2/+84 |
| |\ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-10-06 | 1 | -0/+2 |
| * | | | | | Merge branch 'Version-3.10.9' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -1/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 11 | -90/+83 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Bump provider-engine for better sender validations | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| * | | | | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 2 | -4/+20 |
| * | | | | | | Require keyring-controller 2.1.0 | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 10 | -47/+52 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 18 | -224/+193 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Respect code style | Sergey Ukustov | 2017-09-30 | 2 | -3/+2 |
| * | | | | | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 11 | -9/+372 |
* | | | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 2 | -6/+13 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | lint fix - nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| * | | | | | | | | | nodeify - fix test | kumavis | 2017-10-07 | 1 | -4/+3 |
| |/ / / / / / / / | |||||
| * | | / / / / / | 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 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check status of pending transactions on startup | Dan Finlay | 2017-10-07 | 2 | -0/+3 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined | kumavis | 2017-10-07 | 4 | -2/+81 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 | 3 | -3/+11 |
| * | | | | | | | Add failing test for issue #2294 | Dan Finlay | 2017-10-07 | 1 | -1/+52 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2293 from MetaMask/Version-3.10.9 | kumavis | 2017-10-06 | 2 | -1/+4 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Version 3.10.9v3.10.9 | Dan Finlay | 2017-10-06 | 2 | -1/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #2292 from MetaMask/rebrocast-by-timeStamp | Dan Finlay | 2017-10-06 | 3 | -4/+7 |
|\ \ \ \ \ | |||||
| * | | | | | add to CHANGELOG.md | frankiebee | 2017-10-06 | 1 | -0/+1 |
| * | | | | | "fix" hours for message | frankiebee | 2017-10-06 | 1 | -1/+2 |
| * | | | | | Merge branch 'master' into rebrocast-by-timeStamp | frankiebee | 2017-10-06 | 3 | -6/+6 |
| |\| | | | | |||||
| * | | | | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 2 | -4/+5 |
* | | | | | | Merge pull request #2289 from MetaMask/mascara-tuneups | Thomas Huang | 2017-10-06 | 8 | -86/+76 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | mascara/background: use async await | frankiebee | 2017-10-05 | 1 | -20/+13 |
| * | | | | | use log.debug | frankiebee | 2017-10-05 | 1 | -3/+3 |
| * | | | | | mascara: linting and code clean up | frankiebee | 2017-10-05 | 5 | -58/+41 |
| * | | | | | dont lint jquery | frankiebee | 2017-10-05 | 1 | -1/+1 |
| * | | | | | add /mascara to linting | frankiebee | 2017-10-05 | 1 | -1/+1 |
| * | | | | | mascara:exampl/app - add a send tx button | frankiebee | 2017-10-05 | 2 | -8/+22 |
* | | | | | | Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyrings | Thomas Huang | 2017-10-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Enforce 0x prefix on accounts with new hd keyring | Dan Finlay | 2017-10-05 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2276 from MetaMask/revert-compute | Dan Finlay | 2017-10-05 | 2 | -5/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Revert to normal balances. | Kevin Serrano | 2017-10-05 | 2 | -5/+5 |
| | | | * | Begin implementing sync injection idea | Dan Finlay | 2017-10-05 | 2 | -4/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #2279 from MetaMask/filter-default-fix | Frankie | 2017-10-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 | Thomas Huang | 2017-10-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | chore(package): update coveralls to version 3.0.0 | greenkeeper[bot] | 2017-09-29 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0 | Thomas Huang | 2017-10-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | chore(package): update mocha to version 4.0.0 | greenkeeper[bot] | 2017-10-03 | 1 | -1/+1 |
* | | | | Merge pull request #2175 from MetaMask/RemoveSlackLink | Kevin Serrano | 2017-10-04 | 2 | -7/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into RemoveSlackLink | Kevin Serrano | 2017-10-03 | 46 | -1925/+1786 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into RemoveSlackLink | Kevin Serrano | 2017-09-27 | 18 | -82/+356 |
| |\ \ \ \ | |||||
| * | | | | | Remove slack link | Dan Finlay | 2017-09-27 | 2 | -7/+2 |
* | | | | | | 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 |
* | | | | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-title | Kevin Serrano | 2017-10-04 | 1 | -8/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Removed MetaMasktitle. Fixed #1730. | Branden Soropia | 2017-10-02 | 1 | -8/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2261 from MetaMask/retry-warn-not-fail | Frankie | 2017-10-03 | 3 | -22/+41 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | ui - tx history - simplify error+warning display code | kumavis | 2017-10-03 | 1 | -12/+22 |
| * | | | | | pending tx tracker - on tx:warn append error message instead of error obj | kumavis | 2017-10-03 | 1 | -1/+1 |
| * | | | | | pending tx tracker - test - expect warning event on resubmit failure | kumavis | 2017-10-03 | 1 | -2/+9 |
| * | | | | | pending tx tracker - tx:warning event includes err obj | kumavis | 2017-10-03 | 1 | -2/+2 |
| * | | | | | pending tx tracker - test - rename tests to match event name | kumavis | 2017-10-03 | 1 | -4/+4 |
| * | | | | | 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 pull request #2260 from MetaMask/history-notes | kumavis | 2017-10-03 | 4 | -17/+23 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 4 | -6/+5 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into history-notes | frankiebee | 2017-10-03 | 4 | -3/+27 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #2259 from MetaMask/tx-history-fix | Frankie | 2017-10-03 | 3 | -2/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 3 | -2/+25 |
* | | | | | | | | Merge pull request #2254 from MetaMask/block-cache-fix | Kevin Serrano | 2017-10-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | deps - bump pe for block cache fix | kumavis | 2017-10-03 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | 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 |
| | * | | | | | tx state history - test - fix format of history entries | kumavis | 2017-10-03 | 1 | -0/+26 |
| | |/ / / / | |||||
| | * / / / | transaction - provide notes for history | frankiebee | 2017-10-03 | 2 | -12/+14 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrency | Dan Finlay | 2017-09-30 | 3 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8 | Dan Finlay | 2017-09-30 | 3 | -2/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions | kumavis | 2017-09-30 | 5 | -77/+2 |
|\ \ \ \ \ | |||||
| * | | | | | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 5 | -77/+2 |
* | | | | | | 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 | 5 | -62/+56 |
|\| | | | | | | |||||
| * | | | | | | network - remove long dead etherscan provider code | kumavis | 2017-09-30 | 1 | -10/+0 |
| * | | | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 5 | -23/+12 |
| * | | | | | | network controller - small refactor | kumavis | 2017-09-30 | 2 | -35/+50 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2234 from MetaMask/Version-3.10.7 | kumavis | 2017-09-30 | 2 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Version 3.10.7v3.10.7 | Dan Finlay | 2017-09-30 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #2230 from MetaMask/ui-dev-fix | Dan Finlay | 2017-09-30 | 2 | -66/+69 |
|\ \ \ \ \ | |||||
| * | | | | | development - fix ui dev | kumavis | 2017-09-30 | 2 | -66/+69 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFix | Kevin Serrano | 2017-09-30 | 2 | -0/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Ensure selected account is always set if possible | Dan Finlay | 2017-09-30 | 2 | -0/+10 |
|/ / / / | |||||
* | | | | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 10 | -144/+27 |
|\ \ \ \ | |||||
| * | | | | re-enabled x-metamask-origin for mascara | frankiebee | 2017-09-28 | 2 | -5/+1 |
| * | | | | bump metamascara version | frankiebee | 2017-09-23 | 1 | -1/+1 |
| * | | | | platforms: put context for extension in platform extension class | frankiebee | 2017-09-22 | 3 | -2/+4 |
| * | | | | mascara: turn off background | frankiebee | 2017-09-20 | 2 | -3/+2 |
| * | | | | update metamascara | frankiebee | 2017-09-20 | 1 | -1/+1 |
| * | | | | stub platform | frankiebee | 2017-09-20 | 2 | -0/+2 |
| * | | | | Merge branch 'master' into breakout-mascara | frankiebee | 2017-09-20 | 5 | -6/+18 |
| |\ \ \ \ | |||||
| * | | | | | add context to platform to not have X-Metamask-Origin in mascara | frankiebee | 2017-09-20 | 2 | -1/+2 |
| * | | | | | require metamascara | frankiebee | 2017-09-19 | 6 | -140/+23 |
* | | | | | | Merge pull request #2177 from MetaMask/new-currency-test | kumavis | 2017-09-28 | 7 | -225/+678 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into new-currency-test | kumavis | 2017-09-28 | 33 | -1532/+1362 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #2194 from MetaMask/network-controller-refactor | kumavis | 2017-09-28 | 3 | -36/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | network controller - move _setProvider to bottom | kumavis | 2017-09-28 | 1 | -18/+18 |
| * | | | | | | | network controller - refactor to use _setProvider | kumavis | 2017-09-28 | 2 | -20/+31 |
| * | | | | | | | network - remove getter/setter | kumavis | 2017-09-28 | 1 | -23/+14 |
| * | | | | | | | metamask - improve comment | kumavis | 2017-09-28 | 1 | -2/+1 |
* | | | | | | | | Merge pull request #2193 from MetaMask/FixAccountSelection | Thomas Huang | 2017-09-28 | 4 | -598/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Version 3.10.6 | Dan Finlay | 2017-09-28 | 2 | -1/+3 |
| * | | | | | | | | Commit to the eth-keyring-controller module | Dan Finlay | 2017-09-28 | 2 | -600/+1 |
| * | | | | | | | | Remove dead reference | Dan Finlay | 2017-09-28 | 1 | -1/+0 |
| * | | | | | | | | Bump changelog | Dan Finlay | 2017-09-28 | 1 | -0/+3 |
| * | | | | | | | | Fix Account Selection | Dan Finlay | 2017-09-28 | 2 | -3/+7 |
* | | | | | | | | | Merge pull request #2196 from MetaMask/express-bump | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | deps - bump express for security fix | kumavis | 2017-09-28 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #2195 from MetaMask/greenkeeper/eth-keyring-controller-2.0.0 | Thomas Huang | 2017-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | fix(package): update eth-keyring-controller to version 2.0.0 | greenkeeper[bot] | 2017-09-28 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #2191 from MetaMask/direct-block-trackerv3.10.5 | Dan Finlay | 2017-09-28 | 3 | -8/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | account-tracker - remove unused import | kumavis | 2017-09-28 | 1 | -1/+0 |
| * | | | | | | | | Merge branch 'master' into direct-block-tracker | kumavis | 2017-09-28 | 15 | -556/+838 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 11 | -552/+827 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin... | frankiebee | 2017-09-27 | 3 | -3/+7 |
| * | | | | | | | | | fix tests | frankiebee | 2017-09-27 | 1 | -2/+2 |
| * | | | | | | | | | Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMa... | frankiebee | 2017-09-27 | 1 | -14/+153 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Clean up transactionController tests | tmashuang | 2017-09-26 | 1 | -71/+53 |
| | * | | | | | | | | | Remove pending updateAndApprovedTransaction test | tmashuang | 2017-09-26 | 1 | -10/+0 |
| | * | | | | | | | | | Most of transaction controller tests | tmashuang | 2017-09-23 | 1 | -12/+180 |
| * | | | | | | | | | | 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 | 3 | -20/+20 |
| * | | | | | | | | | | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 6 | -14/+24 |
| * | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 70 | -705/+1240 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | ensure that values written to txParams are hex strings | frankiebee | 2017-09-14 | 2 | -1/+10 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | add test for pendingTxCount | frankiebee | 2017-09-14 | 1 | -0/+13 |
| * | | | | | | | | | linting && format fixing | frankiebee | 2017-09-13 | 2 | -12/+7 |
| * | | | | | | | | | match other controller patterns | frankiebee | 2017-09-13 | 4 | -24/+23 |
| * | | | | | | | | | fix miss type | frankiebee | 2017-09-09 | 1 | -1/+1 |
| * | | | | | | | | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 4 | -12/+34 |
| * | | | | | | | | | 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 | 23 | -115/+527 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add better comments | frankiebee | 2017-09-06 | 3 | -34/+43 |
| * | | | | | | | | | | rename tx-utils.js -> tx-gas-utils.js | frankiebee | 2017-09-06 | 2 | -5/+1 |
| * | | | | | | | | | | remove #buildEthTxFromParams | frankiebee | 2017-09-06 | 2 | -18/+3 |
| * | | | | | | | | | | fix tests | frankiebee | 2017-08-22 | 1 | -4/+7 |
| * | | | | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-08-22 | 21 | -157/+3280 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Create TxStateManager | frankiebee | 2017-08-22 | 3 | -47/+47 |
| * | | | | | | | | | | | Create tests for TxStateManager | frankiebee | 2017-08-19 | 4 | -388/+471 |
* | | | | | | | | | | | | Merge pull request #2190 from MetaMask/Version-3.10.5 | kumavis | 2017-09-28 | 5 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix accountTracker store references | Dan Finlay | 2017-09-28 | 2 | -2/+2 |
| * | | | | | | | | | | | Version 3.10.5 | Dan Finlay | 2017-09-28 | 2 | -1/+3 |
| * | | | | | | | | | | | Fix bug where block gas limit was incorrectly parsed. | Dan Finlay | 2017-09-28 | 2 | -1/+5 |
|/ / / / / / / / / / / | |||||
| | | | | * | | | | | | style - small whitespace nitpick | kumavis | 2017-09-28 | 2 | -4/+4 |
| | | | | * | | | | | | account-tracker - use new block-tracker block format | kumavis | 2017-09-28 | 1 | -4/+2 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2189 from MetaMask/Version-3.10.4 | Dan Finlay | 2017-09-28 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Version 3.10.4v3.10.4 | Dan Finlay | 2017-09-28 | 2 | -1/+5 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #2155 from MetaMask/filter-fixes-moar | Dan Finlay | 2017-09-28 | 7 | -28/+56 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 21 | -260/+397 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #2153 from MetaMask/BreakOutKeyringController | kumavis | 2017-09-28 | 4 | -169/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut... | kumavis | 2017-09-27 | 12 | -56/+663 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #2183 from MetaMask/Fix2094 | Kevin Serrano | 2017-09-27 | 4 | -24/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #2094 from MetaMask/AddBalanceController | Dan Finlay | 2017-09-27 | 16 | -69/+338 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Pass blocktracker to balances controller | Dan Finlay | 2017-09-27 | 1 | -0/+1 |
| * | | | | | | | | | | | Add computed balance to mock state | Dan Finlay | 2017-09-27 | 1 | -1/+3 |
| * | | | | | | | | | | | Make encryptor configurable for keyring-controller | Dan Finlay | 2017-09-26 | 1 | -1/+1 |
| * | | | | | | | | | | | Add mock random value generator | Dan Finlay | 2017-09-26 | 1 | -0/+4 |