Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1859 from MetaMask/v3.9.4v3.9.4 | Frankie | 2017-08-04 | 2 | -2/+6 |
|\ | |||||
| * | v3.9.4 | kumavis | 2017-08-04 | 2 | -2/+6 |
|/ | |||||
* | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 4 | -8/+25 |
|\ | |||||
| * | test - actions - tx - fix async test | kumavis | 2017-08-04 | 1 | -5/+4 |
| * | test - actions - remove commented code | kumavis | 2017-08-04 | 1 | -2/+0 |
| * | nodeify - test - syntax nitpick | kumavis | 2017-08-04 | 1 | -3/+3 |
| * | add test for no callback error | frankiebee | 2017-08-04 | 1 | -0/+11 |
| * | fix test | frankiebee | 2017-08-04 | 1 | -2/+7 |
| * | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 2 | -4/+8 |
* | | Merge pull request #1856 from MetaMask/v3.9.3 | Frankie | 2017-08-04 | 2 | -1/+4 |
|\ \ | |||||
| * | | v3.9.3 | kumavis | 2017-08-04 | 2 | -1/+4 |
|/ / | |||||
* | | Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3 | Kevin Serrano | 2017-08-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | deps - bump eth-detect-phishing | kumavis | 2017-08-04 | 1 | -1/+1 |
* | | | Merge pull request #1852 from MetaMask/blacklist-refactor2 | Kevin Serrano | 2017-08-04 | 3 | -35/+20 |
|\| | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r... | kumavis | 2017-08-04 | 1 | -3/+0 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1850 from MetaMask/stack | Kevin Serrano | 2017-08-04 | 1 | -3/+0 |
|\ \ \ | |_|/ |/| | | |||||
| * | | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
|/ / | |||||
| * | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 3 | -35/+20 |
|/ | |||||
* | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 6 | -272/+331 |
|\ | |||||
| * | remove unused sinon | frankiebee | 2017-08-03 | 1 | -1/+0 |
| * | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
| * | fix test | frankiebee | 2017-08-03 | 1 | -1/+1 |
| * | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 5 | -54/+115 |
| * | lint fixes | frankiebee | 2017-08-02 | 3 | -11/+4 |
| * | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 13 | -25/+163 |
| |\ | |||||
| * | | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| * | | fix addTxDefaults | frankiebee | 2017-08-02 | 2 | -2/+3 |
| * | | add test for addTxDefaults | frankiebee | 2017-08-02 | 1 | -5/+30 |
| * | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 6 | -241/+219 |
* | | | Merge pull request #1849 from MetaMask/blacklist-refactor | Kevin Serrano | 2017-08-03 | 14 | -130/+156 |
|\ \ \ | |_|/ |/| | | |||||
| * | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 6 | -83/+108 |
| * | | phishing detection - move phishing detection into contentscript and metamask ... | kumavis | 2017-08-03 | 10 | -67/+52 |
| * | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| * | | blacklist - add tests for metamask subdomains | kumavis | 2017-08-02 | 1 | -0/+12 |
| * | | blacklist - clearer test format | kumavis | 2017-08-02 | 1 | -5/+5 |
|/ / | |||||
* | | Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdating | Kevin Serrano | 2017-07-28 | 8 | -44/+103 |
|\ \ | |||||
| * | | Do not blacklist files | Dan Finlay | 2017-07-28 | 1 | -1/+0 |
| * | | Add Levenshtein item to changelog | Dan Finlay | 2017-07-27 | 1 | -0/+1 |
| * | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 5 | -2/+67 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1837 from MetaMask/i1833-levencheck | Dan Finlay | 2017-07-27 | 4 | -8/+62 |
|\ \ \ | |||||
| * | | | Give credit where it is due | Kevin Serrano | 2017-07-27 | 2 | -1/+5 |
| * | | | Changelog bump | Kevin Serrano | 2017-07-27 | 1 | -0/+1 |
| * | | | Add levenshtein logic to blacklister. | Kevin Serrano | 2017-07-27 | 2 | -8/+33 |
| * | | | Add test for blacklister. | Kevin Serrano | 2017-07-27 | 1 | -0/+24 |
| | * | | Live update blacklist from Infura | Dan Finlay | 2017-07-27 | 5 | -13/+17 |
| | * | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 5 | -10/+21 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #1834 from MetaMask/Version-3.9.2 | Kevin Serrano | 2017-07-27 | 2 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Version 3.9.2v3.9.2 | Dan Finlay | 2017-07-27 | 2 | -1/+4 |
|/ / / | |||||
* | | | Merge pull request #1830 from MetaMask/providerProxyFix | Frankie | 2017-07-27 | 3 | -9/+17 |
|\ \ \ | |||||
| * | | | nonce-tracker - fix test | kumavis | 2017-07-27 | 1 | -3/+5 |
| * | | | 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 |
| | * | | Begin implementing live-updating blacklist, not working yet | Dan Finlay | 2017-07-27 | 3 | -8/+52 |
| |/ / |/| | | |||||
* | | | Merge pull request #1829 from MetaMask/betterErrorsOnTx | Dan Finlay | 2017-07-27 | 2 | -4/+9 |
|\| | | |||||
| * | | tx cont - dont recursively store history | kumavis | 2017-07-27 | 1 | -3/+9 |
| * | | logState - dont redundantly log to console | kumavis | 2017-07-27 | 1 | -1/+0 |
* | | | Merge pull request #1828 from MetaMask/betterErrorsOnTx | Frankie | 2017-07-27 | 2 | -5/+12 |
|\| | | |/ |/| | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterError... | kumavis | 2017-07-27 | 5 | -3/+13 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1827 from MetaMask/test-coverage | Thomas Huang | 2017-07-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Coveralls badge directs to master branch | Thomas Huang | 2017-07-26 | 1 | -1/+1 |
* | | | Merge pull request #1816 from MetaMask/test-coverage | kumavis | 2017-07-26 | 4 | -2/+12 |
|\| | | |||||
| * | | Run coveralls on all branches | Thomas Huang | 2017-07-26 | 1 | -1/+1 |
| * | | One script runs for Ci build | Thomas Huang | 2017-07-26 | 2 | -3/+2 |
| * | | Simplify the test-coverage script | Thomas Huang | 2017-07-25 | 1 | -1/+1 |
| * | | Add coveralls to script | Thomas Huang | 2017-07-25 | 1 | -1/+1 |
| * | | Configure ci build to run tests individually | Thomas Huang | 2017-07-24 | 1 | -0/+5 |
| * | | Add Test Coverage with nyc package and coveralls for github badge | Thomas Huang | 2017-07-24 | 3 | -2/+8 |
* | | | Merge pull request #1823 from MetaMask/betterErrorsOnTx | kumavis | 2017-07-26 | 3 | -8/+32 |
|\ \ \ | |||||
| * \ \ | Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten... | frankiebee | 2017-07-26 | 5 | -25/+36 |
| |\ \ \ | |||||
| * | | | | fix typo | frankiebee | 2017-07-26 | 1 | -1/+1 |
| | | | * | tx controller + nonce tracker - record nonce components on txMeta | kumavis | 2017-07-27 | 2 | -2/+9 |
| | | | * | nonce-tracker - validation - add validation failing value type to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| | | | * | nonce-tracker - validation - add validation failing value to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' into betterErrorsOnTx | Frankie | 2017-07-26 | 5 | -25/+36 |
| |/| | | |/ / |/| | | |||||
* | | | Merge pull request #1824 from MetaMask/tx-cont-fix | Frankie | 2017-07-26 | 4 | -24/+35 |
|\ \ \ | |||||
| * | | | tx cont - fix test to use async api | kumavis | 2017-07-26 | 1 | -2/+6 |
| * | | | tx cont - add argument for provider constructor | kumavis | 2017-07-26 | 2 | -17/+24 |
| * | | | tx cont - remove old cb from async fn | kumavis | 2017-07-26 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #1821 from MetaMask/fetch-retry-2 | Dan Finlay | 2017-07-26 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | prov-eng - bump to ignore json parse errors | kumavis | 2017-07-26 | 1 | -1/+1 |
|/ / | |||||
| * | fix stack wording | frankiebee | 2017-07-26 | 1 | -2/+2 |
| * | use clone | frankiebee | 2017-07-26 | 2 | -2/+1 |
| * | remove line numbers | frankiebee | 2017-07-26 | 1 | -3/+3 |
| * | Add stack traces both in errors and as a way to track txMetas | frankiebee | 2017-07-26 | 4 | -8/+33 |
|/ | |||||
* | Merge pull request #1801 from MetaMask/i1800-UpdateTutorialLink | Kevin Serrano | 2017-07-21 | 1 | -1/+11 |
|\ | |||||
| * | Add user support link | Dan Finlay | 2017-07-21 | 1 | -0/+4 |
| * | Update tutorial links | Dan Finlay | 2017-07-21 | 1 | -1/+7 |
|/ | |||||
* | Merge pull request #1799 from MetaMask/Version-3.9.1 | kumavis | 2017-07-20 | 3 | -2/+4 |
|\ | |||||
| * | Version 3.9.1v3.9.1 | Dan Finlay | 2017-07-20 | 3 | -2/+4 |
|/ | |||||
* | Merge pull request #1796 from MetaMask/1GweiMinGasPrice | kumavis | 2017-07-20 | 2 | -1/+2 |
|\ | |||||
| * | Lowered minimum gas price to 1 gwei | Dan Finlay | 2017-07-20 | 2 | -1/+2 |
|/ | |||||
* | Merge pull request #1794 from MetaMask/nonce-tracker-fixes | Dan Finlay | 2017-07-19 | 4 | -44/+88 |
|\ | |||||
| * | changelog - add nonce-tracker note | kumavis | 2017-07-19 | 1 | -0/+1 |
| * | transactions - block nonce-tracker while updating pending transactions | kumavis | 2017-07-19 | 2 | -14/+32 |
| * | nonce-tracker - fix lock mechanism to be a real mutex | kumavis | 2017-07-19 | 2 | -11/+16 |
| * | transaction - promisify _checkPendingTxs | kumavis | 2017-07-19 | 1 | -27/+41 |
| * | nonce-tracker - return nonce as integer | kumavis | 2017-07-19 | 1 | -1/+1 |
| * | nonce-tracker - validate nonce calc components | kumavis | 2017-07-19 | 1 | -3/+9 |
|/ | |||||
* | Merge pull request #1787 from MetaMask/i1637-TransactionOrder | kumavis | 2017-07-19 | 3 | -1/+23 |
|\ | |||||
| * | Fix transaction confirmation ordering | Dan Finlay | 2017-07-18 | 3 | -1/+23 |
* | | Merge pull request #1791 from MetaMask/ciBadge | kumavis | 2017-07-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Shield looks better | tmashuang | 2017-07-19 | 1 | -1/+1 |
| * | | Change Ci Badge url for readme | tmashuang | 2017-07-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1786 from MetaMask/turnOffAutoFaucet | Dan Finlay | 2017-07-18 | 3 | -24/+1 |
|\ \ | |/ |/| | |||||
| * | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 3 | -24/+1 |
|/ | |||||
* | Merge pull request #1781 from MetaMask/AddSupportLink | Kevin Serrano | 2017-07-18 | 2 | -2/+9 |
|\ | |||||
| * | Add support page link to help page | Dan Finlay | 2017-07-18 | 2 | -2/+9 |
|/ | |||||
* | Merge pull request #1777 from MetaMask/InfuraTest | kumavis | 2017-07-15 | 3 | -35/+64 |
|\ | |||||
| * | Sinon stub infura network status | tmashuang | 2017-07-15 | 1 | -14/+18 |
| * | Update Sinon | tmashuang | 2017-07-15 | 1 | -1/+1 |
| * | Use Let instead of var | tmashuang | 2017-07-15 | 1 | -1/+1 |
| * | Infura Network response tests | tmashuang | 2017-07-15 | 2 | -34/+59 |
|/ | |||||
* | Merge pull request #1617 from MetaMask/nonce-tracker | Frankie | 2017-07-14 | 9 | -121/+205 |
|\ | |||||
| * | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 3 | -32/+28 |
| * | remove denodeify | frankiebee | 2017-07-14 | 1 | -1/+0 |
| * | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 5 | -36/+40 |
| |\ | |||||
| * | | Fix test to match behavior | frankiebee | 2017-07-13 | 2 | -2/+2 |
| * | | mv updateAndApproveTx to txController | frankiebee | 2017-07-13 | 1 | -3/+7 |
| * | | use new nodeify | frankiebee | 2017-07-13 | 2 | -44/+21 |
| * | | Use txParams | frankiebee | 2017-07-12 | 1 | -4/+4 |
| * | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 7 | -21/+113 |
| |\ \ | |||||
| * \ \ | Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i... | frankiebee | 2017-07-12 | 25 | -129/+689 |
| |\ \ \ | |||||
| | * | | | test - tx controller - fix promise handling | kumavis | 2017-07-08 | 1 | -5/+2 |
| | * | | | test - tx-controller - stub block-tracker method | kumavis | 2017-07-08 | 1 | -1/+1 |
| | * | | | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 25 | -123/+686 |
| | |\ \ \ | |||||
| * | | | | | remove irrelevan code | frankiebee | 2017-07-12 | 1 | -1/+0 |
| |/ / / / | |||||
| * | | | | clean up unused code from old noncelock | frankiebee | 2017-07-06 | 1 | -2/+0 |
| * | | | | fix nonce calculation order | frankiebee | 2017-07-06 | 1 | -6/+7 |
| * | | | | nonce-tracker: only check transactions that are not supposed to be ignored | frankiebee | 2017-06-28 | 2 | -7/+15 |
| * | | | | calculate nonce based on local pending txs w/o error state. | frankiebee | 2017-06-28 | 1 | -1/+10 |
| * | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 26 | -56/+507 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-22 | 5 | -16/+7 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix nonceTracker | frankiebee | 2017-06-22 | 3 | -58/+25 |
| * | | | | | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 3 | -6/+63 |
| * | | | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 5 | -38/+92 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | remove irrelevant test | frankiebee | 2017-06-17 | 1 | -5/+0 |
| * | | | | | | | Fix test to call done | frankiebee | 2017-06-16 | 1 | -7/+8 |
| * | | | | | | | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 3 | -36/+63 |
| * | | | | | | | introduce nonce-tracker | kumavis | 2017-06-15 | 1 | -0/+49 |
* | | | | | | | | Merge pull request #1775 from MetaMask/BlacklistFaster | kumavis | 2017-07-14 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Redirect from malicious sites faster | Dan Finlay | 2017-07-14 | 2 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIst | kumavis | 2017-07-13 | 3 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | limit the range for retryCount | frankiebee | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | write a migration for resubmit tx's to get put back into a submitted state | frankiebee | 2017-07-13 | 2 | -0/+41 |
| * | | | | | | | | add "nonce too low" to the ignored errs list for tx retrys | frankiebee | 2017-07-13 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1770 from MetaMask/Version-3.9.0 | kumavis | 2017-07-13 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove css referencev3.9.0 | Dan Finlay | 2017-07-13 | 1 | -2/+1 |
| * | | | | | | | | Version 3.9.0 | Dan Finlay | 2017-07-13 | 2 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1769 from MetaMask/UpdateMetadata | kumavis | 2017-07-13 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into UpdateMetadata | Dan Finlay | 2017-07-13 | 6 | -2/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update eth-contract-metadata on build | Dan Finlay | 2017-07-13 | 1 | -2/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #1765 from MetaMask/Version-3.8.6 | kumavis | 2017-07-13 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into Version-3.8.6 | Dan Finlay | 2017-07-13 | 6 | -2/+25 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1768 from MetaMask/AddBlacklist | kumavis | 2017-07-13 | 6 | -2/+24 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Refresh blacklist before dist | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | Correct github link | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | Bump node version | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | Point blacklist at main repository | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | Bump changelog | Dan Finlay | 2017-07-13 | 1 | -0/+1 |
| * | | | | | | | | Add first version of phishing site warning | Dan Finlay | 2017-07-13 | 4 | -0/+21 |
|/ / / / / / / / | |||||
| * / / / / / / | Version 3.8.6v3.8.6 | Dan Finlay | 2017-07-12 | 2 | -1/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1758 from MetaMask/3.8.5 | Dan Finlay | 2017-07-12 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 3.8.5 | Dan Finlay | 2017-07-12 | 9 | -55/+143 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #1763 from MetaMask/prov-bump | kumavis | 2017-07-12 | 3 | -35/+35 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | deps - bump prov-eng | kumavis | 2017-07-12 | 1 | -1/+1 |
| * | | | | | | | tests - disable infura test | kumavis | 2017-07-12 | 1 | -33/+33 |
| * | | | | | | | deps - bump prov-eng for fetch retry | kumavis | 2017-07-12 | 1 | -1/+1 |
| * | | | | | | | metamask - on rpc err show whole error body | kumavis | 2017-07-12 | 1 | -1/+1 |
| * | | | | | | | deps - bump prov-eng for retry on gateway timeout | kumavis | 2017-07-12 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogic | kumavis | 2017-07-12 | 4 | -12/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 4 | -4/+49 |
| * | | | | | | | Remove local nonce error setting. | Dan Finlay | 2017-07-12 | 2 | -8/+2 |
* | | | | | | | | Merge pull request #1761 from MetaMask/resubmimtErrors | kumavis | 2017-07-12 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | use .includes | frankiebee | 2017-07-12 | 1 | -3/+3 |
| * | | | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ov... | frankiebee | 2017-07-12 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1757 from MetaMask/resubmit-fixv3.8.5 | Frankie | 2017-07-08 | 3 | -6/+53 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | migration 16 - move resubmit warning back to submitted state | kumavis | 2017-07-08 | 2 | -0/+42 |
| * | | | | | | | tx controller - resubmit - correctly set error on bad nonce/balance | kumavis | 2017-07-08 | 1 | -2/+2 |
| * | | | | | | | tx controller - correctly set error message on resubmit error | kumavis | 2017-07-08 | 1 | -4/+8 |
| * | | | | | | | tx controller - resubmit - recognize parity known hash message | kumavis | 2017-07-08 | 1 | -0/+1 |
|/ / / / / / / | |||||
| * / / / / / | 3.8.5 | kumavis | 2017-07-08 | 2 | -1/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1754 from MetaMask/Version-3.8.4 | kumavis | 2017-07-08 | 2 | -1/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Version 3.8.4v3.8.4 | Dan Finlay | 2017-07-08 | 2 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #1750 from MetaMask/failIfError | kumavis | 2017-07-07 | 1 | -4/+21 |
|\ \ \ \ \ | |||||
| * | | | | | fail transactions that fail in resubmit | frankiebee | 2017-07-07 | 1 | -25/+22 |
| * | | | | | tx controller - clean code | kumavis | 2017-07-07 | 1 | -13/+14 |
| * | | | | | tx controller - move comments | kumavis | 2017-07-07 | 1 | -3/+7 |
| * | | | | | add comment | frankiebee | 2017-07-07 | 1 | -5/+11 |
| * | | | | | if an error happens during a tx publication set tx status to fail | frankiebee | 2017-07-07 | 1 | -1/+10 |
|/ / / / / | |||||
* | | | | | Merge pull request #1748 from MetaMask/Version-3.8.3 | Thomas Huang | 2017-07-07 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.8.3v3.8.3 | Dan Finlay | 2017-07-07 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1747 from MetaMask/FailingTestForFailingLowBalanceTx | Dan Finlay | 2017-07-07 | 3 | -4/+57 |
|\ \ \ \ \ | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-07-06 | 1 | -0/+1 |
| * | | | | | Fix failing test | Dan Finlay | 2017-07-06 | 2 | -39/+35 |
| * | | | | | Add missing done | Dan Finlay | 2017-07-06 | 1 | -1/+2 |
| * | | | | | Typo fix | Dan Finlay | 2017-07-06 | 1 | -1/+1 |
| * | | | | | Merge branch 'FailLowBalance' into FailingTestForFailingLowBalanceTx | Dan Finlay | 2017-07-06 | 1 | -4/+22 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fail pending txs with low balance or invalid nonce | Dan Finlay | 2017-07-06 | 1 | -4/+22 |
| * | | | | | | Add failing test for retrying an over-spending tx | Dan Finlay | 2017-07-06 | 1 | -0/+37 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1742 from MetaMask/TokenSymbolMisspelled | kumavis | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix spelling | tmashuang | 2017-07-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1741 from MetaMask/ReEnableTokenList | kumavis | 2017-07-06 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Reenable Default Token List | Dan Finlay | 2017-07-06 | 2 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1739 from MetaMask/origin-header | Dan Finlay | 2017-07-06 | 2 | -4/+11 |
|\ \ \ \ \ | |||||
| * | | | | | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 2 | -4/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #1733 from MetaMask/Version-3.8.2 | Thomas Huang | 2017-07-04 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.8.2v3.8.2 | Dan Finlay | 2017-07-04 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig | Kevin Serrano | 2017-07-04 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1720-NoSpinnerOnConfig | Kevin Serrano | 2017-07-04 | 3 | -23/+49 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1729 from MetaMask/i1707-ClarifySearchingIndication | Kevin Serrano | 2017-07-04 | 3 | -23/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bump changelog | Dan Finlay | 2017-07-04 | 1 | -0/+3 |
| * | | | | | | Indicate which network is being searched for | Dan Finlay | 2017-07-04 | 1 | -1/+22 |
| * | | | | | | Add menu carrat next to network searching indicator | Dan Finlay | 2017-07-04 | 2 | -22/+25 |
|/ / / / / / | |||||
| * / / / / | No longer show network spinner on config screen | Dan Finlay | 2017-07-04 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1714 from MetaMask/Version-3.8.1 | Thomas Huang | 2017-07-01 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.8.1v3.8.1 | Dan Finlay | 2017-07-01 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1711 from MetaMask/NoPopularTOkens | Thomas Huang | 2017-07-01 | 2 | -1/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into NoPopularTOkens | Thomas Huang | 2017-07-01 | 3 | -1/+7 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1712 from MetaMask/RemoveTokenSending | Thomas Huang | 2017-07-01 | 2 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into RemoveTokenSending | Thomas Huang | 2017-07-01 | 2 | -1/+4 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #1710 from MetaMask/BumpTokenTracker | Thomas Huang | 2017-07-01 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bump token-tracker to 1.1.2 | Dan Finlay | 2017-07-01 | 2 | -1/+2 |
| * | | | | | | | Bump token-tracker to 1.1.1 | Dan Finlay | 2017-07-01 | 2 | -1/+4 |
|/ / / / / / / | |||||
| * / / / / / | Remove send button | Dan Finlay | 2017-07-01 | 2 | -0/+4 |
|/ / / / / / | |||||
| * / / / / | Stop loading popular tokens by default | Dan Finlay | 2017-07-01 | 2 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #1703 from MetaMask/deps-dedupe | Kevin Serrano | 2017-06-30 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | deps - remove duplicated dev-dependencies | kumavis | 2017-06-30 | 1 | -3/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1701 from MetaMask/BumpWeb3 | Kevin Serrano | 2017-06-30 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bump web3 version to 0.9.1 | Dan Finlay | 2017-06-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #1700 from MetaMask/StyleImprovements | Kevin Serrano | 2017-06-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add padding to token messages | Dan Finlay | 2017-06-29 | 1 | -0/+1 |
* | | | | | | Merge pull request #1699 from MetaMask/change-send-wording | Thomas Huang | 2017-06-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | change “ACCEPT” to “SUBMIT” | frankiebee | 2017-06-30 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1691 from MetaMask/Version-3.8.0 | Kevin Serrano | 2017-06-29 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Version 3.8.0v3.8.0 | Dan Finlay | 2017-06-29 | 2 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1690 from MetaMask/i1669-StateCopyButton | Thomas Huang | 2017-06-29 | 2 | -0/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Add copy state logs button | Dan Finlay | 2017-06-29 | 2 | -0/+29 |
* | | | | | | Merge pull request #1634 from MetaMask/i784-SendTokenButton | Thomas Huang | 2017-06-29 | 2 | -7/+30 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-28 | 5 | -22/+45 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-24 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into i784-SendTokenButton | Dan Finlay | 2017-06-23 | 7 | -18/+34 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix propagation | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton | Dan Finlay | 2017-06-20 | 7 | -49/+95 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add send button to TokenFactory | Dan Finlay | 2017-06-20 | 2 | -7/+30 |
* | | | | | | | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 12 | -57/+397 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Remove token contract validation step | Dan Finlay | 2017-06-28 | 1 | -13/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-06-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Support other network links | Dan Finlay | 2017-06-28 | 3 | -19/+27 |
| * | | | | | | | | | | Do not allow adding non token addresses | Dan Finlay | 2017-06-28 | 1 | -1/+13 |
| * | | | | | | | | | | Support other network links | Dan Finlay | 2017-06-28 | 3 | -19/+27 |
| |/ / / / / / / / / |