Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 1 | -10/+5 |
|\ | |||||
| * | 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 |
| |/ | |||||
* | | 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 |
|\| | |||||
| * | 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 |