Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-06-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix Back Button on Add Token View | Thomas Huang | 2017-06-27 | 1 | -1/+2 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * / | | | | | | | | Fix token adding bug | Dan Finlay | 2017-06-28 | 1 | -1/+3 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' into i1616-AddTokenAdding | Dan Finlay | 2017-06-23 | 7 | -18/+34 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Reduce token list clutter by only showing held tokens | Dan Finlay | 2017-06-20 | 1 | -7/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 7 | -49/+95 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 7 | -21/+78 |
| * | | | | | | | Make add token screen a fully working form | Dan Finlay | 2017-06-16 | 1 | -11/+141 |
| * | | | | | | | Merge branch 'AddTokenList' into AddingTokens | Dan Finlay | 2017-06-16 | 5 | -27/+20 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove log | Dan Finlay | 2017-06-16 | 1 | -1/+0 |
| * | | | | | | | | Create add token button and template view | Dan Finlay | 2017-06-15 | 6 | -24/+170 |
* | | | | | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice | Dan Finlay | 2017-06-28 | 2 | -7/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update change log | Thomas Huang | 2017-06-28 | 1 | -0/+1 |
| * | | | | | | | | | Merge branch 'master' into i1473-dappDefaultGasPrice | Thomas Huang | 2017-06-28 | 28 | -64/+514 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
* | | | | | | | | | | Merge pull request #1681 from MetaMask/AddressStripping | Dan Finlay | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove trailing periods and white space | Thomas Huang | 2017-06-28 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1688 from MetaMask/i1687-BackButtonImportScreen | Dan Finlay | 2017-06-28 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add Back Button for Import Screen | Thomas Huang | 2017-06-28 | 1 | -0/+9 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1685 from MetaMask/setFailed | Dan Finlay | 2017-06-28 | 2 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting tx.'... | frankiebee | 2017-06-28 | 2 | -0/+39 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1675 from MetaMask/warning-fixes | Dan Finlay | 2017-06-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix react warning for keys on ens address book | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
| * | | | | | | | | | | Fix react warning on create-vault-complete | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #1683 from MetaMask/RenameSendToNext | Dan Finlay | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Rename Send to Next | Thomas Huang | 2017-06-28 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1684 from MetaMask/neverGiveUp | Thomas Huang | 2017-06-28 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 2 | -4/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #1678 from MetaMask/i1584-seederror | Thomas Huang | 2017-06-27 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i1584-seederror | Thomas Huang | 2017-06-27 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1677 from MetaMask/i1676-quickclick | Thomas Huang | 2017-06-27 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Change disabling button as state property. | Kevin Serrano | 2017-06-27 | 1 | -5/+4 |
| * | | | | | | | | | | Bump changelog. | Kevin Serrano | 2017-06-27 | 1 | -0/+1 |
| * | | | | | | | | | | Prevent users from accidentally submitting two transactions by disabling button. | Kevin Serrano | 2017-06-27 | 1 | -0/+3 |
|/ / / / / / / / / / | |||||
| * | | | | | | | | | Bump changelog. | Kevin Serrano | 2017-06-27 | 1 | -0/+1 |
| * | | | | | | | | | Fix error message for invalid seed words. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 3 | -1/+90 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove option fetch | frankiebee | 2017-06-23 | 1 | -2/+1 |
| * | | | | | | | | | add `done` and stub fetch | frankiebee | 2017-06-23 | 1 | -8/+9 |
| * | | | | | | | | | Add test for infura controller. | Kevin Serrano | 2017-06-23 | 1 | -0/+34 |
| * | | | | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+1 |
| * | | | | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 2 | -1/+56 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #1674 from MetaMask/remove-maps | Thomas Huang | 2017-06-27 | 2 | -8/+8 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Simplify build variables. Remove maps from production. | Kevin Serrano | 2017-06-27 | 2 | -8/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1603 from MetaMask/AddTokenList | Kevin Serrano | 2017-06-23 | 22 | -45/+402 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Print integration build errors | Dan Finlay | 2017-06-22 | 1 | -6/+8 |
| * | | | | | | | Bump circleCI node version to 8.0.0 | Dan Finlay | 2017-06-21 | 1 | -1/+1 |
| * | | | | | | | Add better event lifecycle management to token list. | Dan Finlay | 2017-06-20 | 1 | -4/+18 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fix token balance rendering | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| * | | | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Dan Finlay | 2017-06-20 | 7 | -47/+93 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge branch 'master' into AddTokenList | Kevin Serrano | 2017-06-20 | 1 | -9/+0 |
| | |\| | | | | | |||||
| | * | | | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Kevin Serrano | 2017-06-20 | 20 | -38/+379 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | / | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Add MetaMark support | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 5 | -27/+20 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||||
| * | | | | Hide message on normal loading | Dan Finlay | 2017-06-15 | 1 | -1/+3 |
| * | | | | Multiple loading style improvements | Dan Finlay | 2017-06-15 | 2 | -8/+16 |
| * | | | | Remove excessive log | Dan Finlay | 2017-06-15 | 1 | -1/+0 |
| * | | | | Add no tokens message | Dan Finlay | 2017-06-15 | 1 | -9/+13 |
| * | | | | Bump token-tracker version | Dan Finlay | 2017-06-15 | 1 | -1/+1 |
| * | | | | Vertically center loading indication | Dan Finlay | 2017-06-15 | 1 | -2/+10 |
| * | | | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 3 | -7/+23 |
| * | | | | Persist selected account tab | Dan Finlay | 2017-06-15 | 6 | -14/+52 |
| * | | | | Rename history to sent | Dan Finlay | 2017-06-14 | 1 | -1/+1 |
| * | | | | Remove bad state file | Dan Finlay | 2017-06-14 | 1 | -93/+0 |
| * | | | | Add token list note to changelog | Dan Finlay | 2017-06-14 | 1 | -0/+2 |
| * | | | | Auto populate token list with popular token balances | Dan Finlay | 2017-06-14 | 7 | -32/+68 |
| * | | | | Fix build for eth-contract-metadata | Dan Finlay | 2017-06-14 | 2 | -2/+2 |
| * | | | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 160 | -7504/+3175 |
| |\ \ \ \ | |||||
| * | | | | | Add missing tx manager state | Dan Finlay | 2017-04-25 | 1 | -0/+1 |
| * | | | | | Add placeholder etherscan token icons | Dan Finlay | 2017-04-25 | 3 | -3/+35 |
| * | | | | | Get token list looking ok | Dan Finlay | 2017-04-22 | 5 | -12/+136 |
| * | | | | | Add token-list dev state | Dan Finlay | 2017-04-22 | 1 | -0/+93 |
| * | | | | | Add functional but ugly and hard-coded token list | Dan Finlay | 2017-04-21 | 7 | -15/+119 |
* | | | | | | Merge pull request #1655 from MetaMask/fix-malito | Thomas Huang | 2017-06-22 | 1 | -5/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix broken malito link. | Kevin Serrano | 2017-06-22 | 1 | -5/+1 |
* | | | | | | | Merge pull request #1646 from MetaMask/ScarierSeedWording | Frankie | 2017-06-22 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Bump changelog | Dan Finlay | 2017-06-21 | 1 | -0/+1 |
| * | | | | | | Make seed confirmation wording scarier | Dan Finlay | 2017-06-21 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1644 from MetaMask/i1630-badgefix | Frankie | 2017-06-21 | 2 | -1/+4 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Bump changelog. | Kevin Serrano | 2017-06-21 | 1 | -0/+1 |
| * | | | | | Fix badge number to include personal_sign | Kevin Serrano | 2017-06-21 | 1 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1624 from MetaMask/TestLinting | Kevin Serrano | 2017-06-20 | 1 | -9/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Remove second linting script for tests | Thomas Huang | 2017-06-18 | 1 | -9/+0 |
* | | | | | Merge pull request #1607 from MetaMask/i1567-FixInaccurateError | Frankie | 2017-06-17 | 4 | -20/+20 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 2 | -4/+3 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1623 from MetaMask/checkTxs | Frankie | 2017-06-17 | 2 | -4/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | put the block listeners back on the provider | frankiebee | 2017-06-17 | 1 | -3/+2 |
| * | | | | | bump provider engine | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | * | | | | put event back on the "blockTracker:/provider" | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | * | | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-17 | 2 | -1/+20 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1622 from MetaMask/i1621-DebounceBackgroundUpdates | Thomas Huang | 2017-06-16 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -1/+5 |
|/ / / / / / |