aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
|/
* 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-241-3/+1
* | Wrap the provider in a proxyfrankiebee2017-05-231-20/+7
* | Merge branch 'master' into networkControllerfrankiebee2017-05-231-5/+19
|/
* Fix path referencesDan Finlay2017-05-171-2/+2
* Rename tx manager to tx controllerDan Finlay2017-05-171-0/+404