aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+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
| |/
* | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
* | Merge branch 'master' into AddTokenListDan Finlay2017-06-131-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-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