aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-16/+52
|\
| * Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-161-0/+46
| |\
| | * transactions controller - add commentskumavis2017-06-161-0/+5
| | * add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-151-0/+41
| * | check for the tx in the block that provider engine gives usfrankiebee2017-06-151-15/+5
| |/
* | check nonce and balance when resubmiting txfrankiebee2017-06-161-11/+16
* | remove unnecessary logfrankiebee2017-06-151-4/+1
* | Do not mark slowly mined txs as failed.Dan Finlay2017-06-151-8/+4
|/
* Merge pull request #1598 from MetaMask/txRetryDan Finlay2017-06-141-9/+4
|\
| * rename continuallyResubmitPendingTxs to resubmitPendingTxsfrankiebee2017-06-141-2/+2
| * put tx resubmission on the block eventfrankiebee2017-06-131-8/+3
* | Fix networkState in chain idThomas Huang2017-06-131-1/+1
|/
* Use new URL for currency API from cryptonator.Kevin Serrano2017-06-061-1/+1
* stop polling when switching networksfrankiebee2017-05-241-0/+1
* Merge branch 'master' into networkControllerFrankie2017-05-241-4/+55
|\
| * CleanupDan Finlay2017-05-241-2/+3
| * Continually resubmit pending txsDan Finlay2017-05-241-2/+52
* | Fix for testsfrankiebee2017-05-242-52/+36
* | Wrap the provider in a proxyfrankiebee2017-05-232-80/+57
* | Merge branch 'master' into networkControllerfrankiebee2017-05-231-0/+418
|\|
| * Fix path referencesDan Finlay2017-05-171-2/+2
| * Rename tx manager to tx controllerDan Finlay2017-05-171-0/+404
* | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-191-0/+152
|/
* Fix linting warningsThomas Huang2017-04-273-13/+11
* Limit the number of addresses stored in our book.Kevin Serrano2017-03-141-0/+4
* Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-111-4/+18
* Improve duplicate checking in address book.Kevin Serrano2017-03-111-2/+2
* Add comments.Kevin Serrano2017-03-111-4/+19
* Rename functions for consistency.Kevin Serrano2017-03-101-6/+6
* Create persistence address book.Kevin Serrano2017-03-101-0/+46
* Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+3
* Refactor of code into separate reducers and actions.Kevin Serrano2017-03-081-1/+1
* More conflict resolution.Kevin Serrano2017-03-021-1/+0
* add controllers to root scripts folderDan Finlay2017-02-283-0/+238
generated by cgit (git 2.34.1) at 2024-10-15 10:14:36 +0800