| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 1 | -4/+25 |
| |\ | | | | | Add ability to add tokens to token list | ||||
| | * | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 1 | -35/+68 |
| | |\ | |||||
| | * | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -4/+25 |
| | | | | | | | | | | | | | Fiex #1616 | ||||
| * | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice | Dan Finlay | 2017-06-28 | 1 | -7/+9 |
| |\ \ \ | | | | | | | | | I1473 dapp default gas price | ||||
| | * \ \ | Merge branch 'master' into i1473-dappDefaultGasPrice | Thomas Huang | 2017-06-28 | 3 | -1/+51 |
| | |\ \ \ | |||||
| | * | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
| | | | | | | |||||
| * | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 1 | -4/+0 |
| | |/ / / |/| | | | |||||
| * | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 1 | -0/+42 |
| |\ \ \ \ | |_|_|/ |/| | | | Add Infura Status Information to UI State | ||||
| | * | | | 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 | 1 | -0/+42 |
| | |/ / | |||||
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 2 | -1/+9 |
| |\ \ \ | |/ / |/| / | |/ | AddTokenList | ||||
| | * | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 1 | -10/+5 |
| | |\ | |||||
| | * | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 1 | -1/+0 |
| | | | | |||||
| | * | | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | Also improve error handling with token balances. | ||||
| | * | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 5 | -14/+596 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| | * | | | | put the block listeners back on the provider | frankiebee | 2017-06-17 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | put event back on the "blockTracker:/provider" | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-16 | 1 | -16/+52 |
| |\| | | | | |||||
| | * | | | | Merge pull request #1611 from MetaMask/checkTxsOnSync | kumavis | 2017-06-16 | 1 | -0/+46 |
| | |\ \ \ \ | | | | | | | | | | | | | add a check for weather a tx is included in a block when jumping blocks | ||||
| | | * | | | | transactions controller - add comments | kumavis | 2017-06-16 | 1 | -0/+5 |
| | | | | | | | |||||
| | | * | | | | add a check for weather a tx is included in a block when jumping blocks | frankiebee | 2017-06-15 | 1 | -0/+41 |
| | | | |_|/ | | |/| | | |||||
| | * / | | | check for the tx in the block that provider engine gives us | frankiebee | 2017-06-15 | 1 | -15/+5 |
| | |/ / / | |||||
| * | | | | check nonce and balance when resubmiting tx | frankiebee | 2017-06-16 | 1 | -11/+16 |
| | | | | | |||||
| * | | | | remove unnecessary log | frankiebee | 2017-06-15 | 1 | -4/+1 |
| | | | | | |||||
| * | | | | Do not mark slowly mined txs as failed. | Dan Finlay | 2017-06-15 | 1 | -8/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`. | ||||
| * | | | Merge pull request #1598 from MetaMask/txRetry | Dan Finlay | 2017-06-14 | 1 | -9/+4 |
| |\ \ \ | | | | | | | | | put tx resubmission on the block event | ||||
| | * | | | rename continuallyResubmitPendingTxs to resubmitPendingTxs | frankiebee | 2017-06-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | put tx resubmission on the block event | frankiebee | 2017-06-13 | 1 | -8/+3 |
| | | |/ | |/| | |||||
| * / | | Fix networkState in chain id | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 1 | -4/+55 |
| |\ \ | |||||
| | * | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| | | | | |||||
| | * | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 1 | -2/+52 |
| | | | | |||||
| * | | | Fix for tests | frankiebee | 2017-05-24 | 2 | -52/+36 |
| | | | | |||||
| * | | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 2 | -80/+57 |
| | | | | |||||
| * | | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 1 | -0/+418 |
| |\| | | |||||
| | * | | Fix path references | Dan Finlay | 2017-05-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 1 | -0/+404 |
| | | | | |||||
| * | | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 1 | -0/+152 |
| |/ / | |||||
| * / | Fix linting warnings | Thomas Huang | 2017-04-27 | 3 | -13/+11 |
| |/ | |||||
| * | Limit the number of addresses stored in our book. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | | |||||
| * | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 1 | -4/+18 |
| | | |||||
| * | Improve duplicate checking in address book. | Kevin Serrano | 2017-03-11 | 1 | -2/+2 |
| | | |||||
| * | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -4/+19 |
| | | |||||
| * | Rename functions for consistency. | Kevin Serrano | 2017-03-10 | 1 | -6/+6 |
| | | |||||
| * | Create persistence address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+46 |
| | | |||||
| * | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+3 |
| | | |||||
| * | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 1 | -1/+1 |
| | | |||||
| * | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -1/+0 |
| | | |||||
| * | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 3 | -0/+238 |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |