aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
Commit message (Expand)AuthorAgeFilesLines
* transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-31/+18
* transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-0/+12
* transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-7/+12
* transactions - normalize txParamsfrankiebee2018-04-051-2/+52
* app - currency - fix typo + prefer log over consolekumavis2018-04-041-2/+3
* app - currency - fix typokumavis2018-04-041-1/+1
* app - warn on fetch errors instead of spamming sentrykumavis2018-04-044-32/+28
* transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-031-2/+3
* transactions#newUnapprovedTransaction - dont default origin to metamaskfrankiebee2018-03-311-1/+1
* transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-311-1/+3
* Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-291-1/+1
|\
| * controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
* | tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-281-4/+6
|/
* Use extension api to get initial locale.Dan2018-03-221-1/+1
* Merge branch 'master' into i18n-translator-reduxDan2018-03-221-0/+4
|\
| * Merge pull request #3504 from lazaridiscom/laz/i3427kumavis2018-03-211-0/+4
| |\
| | * add READMEs to folders, re #3427Lazaridis2018-03-141-0/+4
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-21/+32
|\| |
| * | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
| * | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
| * | Merge branch 'master' into retry-tx-refractorDan2018-03-091-2/+2
| |\|
| * | fix marking of confirmed transaction as droppedfrankiebee2018-03-091-1/+1
| * | transactions - make _markNonceDuplicatesDroppedfrankiebee2018-03-081-21/+20
| * | refactor retrytx with higher gas price:frankiebee2018-03-081-16/+27
* | | Handle i18n with redux.Dan2018-03-161-0/+5
| |/ |/|
* | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
|/
* Merge branch 'master' into uatDan2018-02-081-0/+4
|\
| * wipe only transactions for current accountBruno Barbieri2018-01-311-2/+2
| * added reset account featureBruno Barbieri2018-01-311-0/+4
* | Merge branch 'uat' into newmasterChi Kei Chan2018-01-203-6/+75
|\ \ | |/ |/|
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-173-6/+75
| |\
| | * Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-233-6/+75
| | |\
| | | * Track usage of old and new UI (#2794)Alexander Tseung2017-12-231-6/+34
| | | * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-211-0/+4
| | | |\
| | | | * Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-211-5/+4
| | | | * Canceled, edited transactions show edited amount.Dan2017-12-211-0/+5
| | | * | Merge branch 'master' into NewUI-flatDan2017-12-214-17/+125
| | | |\ \ | | | | |/ | | | |/|
| | | * | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-082-1/+7
| | | |\ \
| | | | * \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-071-0/+6
| | | | |\ \
| | | | * | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+1
| | | * | | | Lint fixDan2017-12-051-1/+1
| | | * | | | Add UI selectionDan2017-12-051-0/+17
| | | |/ / /
| | | * | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
| | | * | | toggle wired up to preferences property storeJason Clark2017-11-251-2/+2
| | | * | | incremental commitClark, Jason (Contractor)2017-11-241-0/+8
| | | * | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-1/+2
| | | |\ \ \
| | | * | | | Lint fixes for NewUI-flat.Dan2017-11-021-2/+0
| | | * | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-252-5/+5
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-0/+4
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-212-6/+27
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-1/+12
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-043-36/+42
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-041-1/+12
* | | | | | | | | | | | Update transactions.jskumavis2018-01-181-1/+1
* | | | | | | | | | | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
* | | | | | | | | | | | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
* | | | | | | | | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' into open-popupFrankie2018-01-162-9/+78
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-161-7/+73
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-131-2/+3
| | * | | | | | | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-121-7/+72
| * | | | | | | | | | | | provider - infura - use infura REST apikumavis2018-01-091-2/+5
| * | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | | | | | | | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Fix feature to workDan Finlay2018-01-061-1/+2
* | | | | | | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-062-1/+3
|/ / / / / / / / / /
* | | | | | | | | / Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-211-0/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| * | | | | | | | | Add Recent Blocks controllerDan Finlay2017-12-181-0/+37
* | | | | | | | | | Allow updating token detailsDan Finlay2017-12-191-4/+4
|/ / / / / / / / /
* | | | | | | | | Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
* | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-141-7/+50
* | | | | | | | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-141-50/+7
* | | | | | | | | network - for infura networks use the infura block tracker providerkumavis2017-12-141-7/+50
* | | | | | | | | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
* | | | | | | | | tx-controller - failed state is a finished statekumavis2017-12-081-6/+8
* | | | | | | | | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
* | | | | | | | | Merge branch 'master' into patch-2Dan Finlay2017-12-081-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+4
| * | | | | | | | | Add retry background method and actionDan Finlay2017-12-071-0/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | A more expressive wayvicnaum2017-12-071-5/+2
* | | | | | | | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
|/ / / / / / / /
* | | | | | | | Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
* | | | | | | | Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-061-0/+6
* | | | | | | | Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | network controller - warn via log.warnkumavis2017-11-281-1/+1
| * | | | | | | Update network.jskumavis2017-10-241-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-061-1/+1
* | | | | | | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-252-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix lint warningsDaijiro Wachi2017-10-222-5/+5
| | |_|_|/ | |/| | |
* / | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
|/ / / /
* | | | Allow computed balances to enumerate its own viewDan Finlay2017-10-201-2/+3
* | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-192-28/+27
|\ \ \ \ | | |/ / | |/| |
| * | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-192-28/+27
* | | | Make account tracking more reactiveDan Finlay2017-10-191-8/+14
* | | | Refresh computed balances controller when restoring vaultDan Finlay2017-10-191-0/+4
* | | | Add validation to balance constructorDan Finlay2017-10-191-0/+10
|/ / /
* | | nonce-tracker - use blockTracker directlykumavis2017-10-121-0/+1
* | | network-controller - use obj-proxy for providerProxykumavis2017-10-111-3/+4
* | | lint fixeskumavis2017-10-111-7/+2
* | | network controller - refactor to use eth-rpc-clientkumavis2017-10-111-26/+30
* | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-071-0/+1
* | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-061-1/+1
|/ /
* | transaction - provide notes for historyfrankiebee2017-10-031-7/+9
* | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-301-1/+1
* | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-301-10/+1
|\ \
| * | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-301-10/+1
| |/
* | network - make network controller internal network switching explicitkumavis2017-09-301-2/+3
* | network - convert localhost from custom rpc to network typekumavis2017-09-301-0/+1
* | network controller - small refactorkumavis2017-09-301-18/+29
|/
* Merge branch 'master' into new-currency-testkumavis2017-09-285-328/+261
|\
| * Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-281-31/+33
| |\
| | * network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| | * network controller - refactor to use _setProviderkumavis2017-09-281-17/+28
| | * network - remove getter/setterkumavis2017-09-281-23/+14
| * | Fix Account SelectionDan Finlay2017-09-281-1/+1
| * | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-282-282/+98
| |\ \
| | * | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-271-0/+5
| | * | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| | * | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-271-3/+3
| | * | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-272-5/+15
| | * | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-273-3/+130
| | |\ \
| | * | | ensure that values written to txParams are hex stringsfrankiebee2017-09-141-1/+1
| | * | | linting && format fixingfrankiebee2017-09-131-7/+3
| | * | | match other controller patternsfrankiebee2017-09-131-14/+8
| | * | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-091-11/+4
| | * | | fix messy mergefrankiebee2017-09-071-4/+4
| | * | | fix merge and errors disaperaing on updatefrankiebee2017-09-071-1/+1
| | * | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-071-1/+12
| | |\ \ \
| | * | | | add better commentsfrankiebee2017-09-061-31/+41
| | * | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-221-1/+1
| | |\ \ \ \
| | * | | | | Create TxStateManagerfrankiebee2017-08-221-45/+28
| | * | | | | Create tests for TxStateManagerfrankiebee2017-08-191-192/+17
| * | | | | | Fix accountTracker store referencesDan Finlay2017-09-281-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-283-3/+131
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Move obs store into account-tracker instead of inheritingDan Finlay2017-09-272-5/+5
| | * | | | Make blockTracker an independent paramDan Finlay2017-09-262-3/+6
| | * | | | Implemented feedbackDan Finlay2017-09-261-2/+2
| | * | | | Made some requested changesDan Finlay2017-09-261-7/+7
| | * | | | Fix account-tracker referencesDan Finlay2017-09-232-8/+8
| | * | | | Refactor eth-store into account-trackerDan Finlay2017-09-232-5/+5
| | * | | | Add computed balance to account detail viewDan Finlay2017-09-142-7/+11
| | * | | | Got pending balance updating correctlyDan Finlay2017-09-142-81/+65
| | * | | | Add state-labeled events to allow subscribing to any transaction's state changeDan Finlay2017-09-141-0/+1
| | * | | | Some progressDan Finlay2017-09-132-0/+136
| | | |_|/ | | |/| |
| * | | | network contoller - clean up unused codefrankiebee2017-09-271-6/+0
| * | | | listen for the blocke event on the block tracker instead of rawBlock on the p...frankiebee2017-09-272-2/+1
| * | | | wrap block tracker in events proxyfrankiebee2017-09-271-14/+8
| |/ / /
* | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-191-2/+2
* | | | integrate infura currencyKevin Serrano2017-08-301-3/+3
|/ / /
* | | Fail transactions after a day of retriesDan Finlay2017-08-241-1/+5
* | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-241-16/+19
|\ \ \ | | |/ | |/|
| * | tx controller - tx state history various small fixeskumavis2017-08-151-1/+0
| * | introduce tx-state-history-helper and diff-based historykumavis2017-08-151-15/+19
| |/
* / use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-191-0/+7
|/
* tx controller - fix error serializationkumavis2017-08-091-2/+5
* tx controller - fix getBalance fnkumavis2017-08-091-1/+1
* filter by network for pending txsfrankiebee2017-08-091-0/+2
* fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-091-2/+1
* fix class namesfrankiebee2017-08-091-16/+22
* fix the bind on pending tx watchersfrankiebee2017-08-081-3/+3
* Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-081-2/+3
|\
| * blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-051-2/+3
* | remove unnecessary if statment for error messagefrankiebee2017-08-081-1/+0
* | fix spellingfrankiebee2017-08-081-9/+9
* | rename PendingTransactionUtils -> PendingTransactionWatchersfrankiebee2017-08-051-8/+8
* | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-053-18/+59
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r...kumavis2017-08-041-3/+0
| |\
| | * remove stack from txsfrankiebee2017-08-041-3/+0
| * | blacklist - use module eth-phishing-detectkumavis2017-08-041-10/+18
| |/
| * Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-172/+173
| |\
| * | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-032-15/+51
* | | break out tx status pendding watchersfrankiebee2017-08-051-145/+27
* | | use error for #approveTransaction when setting failedfrankiebee2017-08-031-5/+2
| |/ |/|
* | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-21/+42
* | lint fixesfrankiebee2017-08-021-4/+2
* | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-022-1/+26
|\|
| * Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-271-1/+0
| |\
| | * nonce-tracker - hotfix for provider proxyingkumavis2017-07-271-1/+0
| * | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-271-0/+14
| |/
| * tx cont - dont recursively store historykumavis2017-07-271-3/+9
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterError...kumavis2017-07-271-1/+1
| |\
| * | tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-271-0/+4
* | | fix addTxDefaultsfrankiebee2017-08-021-1/+1
* | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-158/+138
| |/ |/|
* | Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten...frankiebee2017-07-262-7/+8
|\|
| * Merge branch 'master' into betterErrorsOnTxFrankie2017-07-262-7/+8
| |\
| | * tx cont - add argument for provider constructorkumavis2017-07-261-2/+3
| | * tx cont - remove old cb from async fnkumavis2017-07-261-5/+5
* | | fix typofrankiebee2017-07-261-1/+1
|/ /
* | fix stack wordingfrankiebee2017-07-261-2/+2
* | use clonefrankiebee2017-07-261-1/+1
* | remove line numbersfrankiebee2017-07-261-3/+3
* | Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-261-8/+22
|/
* transactions - block nonce-tracker while updating pending transactionskumavis2017-07-191-0/+3
* transaction - promisify _checkPendingTxskumavis2017-07-191-27/+41
* Infura Network response teststmashuang2017-07-151-0/+1
* Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-141-46/+58
|\
| * make publishTransaction and signTransaction async methodsfrankiebee2017-07-141-19/+12
| * mv updateAndApproveTx to txControllerfrankiebee2017-07-131-3/+7
| * Merge branch 'master' into nonce-trackerfrankiebee2017-07-121-20/+16
| |\
| * \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i...frankiebee2017-07-122-23/+71
| |\ \
| | * \ Merge branch 'master' into nonce-trackerkumavis2017-07-082-23/+71
| | |\ \
| * | | | remove irrelevan codefrankiebee2017-07-121-1/+0
| |/ / /
| * | | clean up unused code from old noncelockfrankiebee2017-07-061-2/+0
| * | | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-281-1/+8
| * | | calculate nonce based on local pending txs w/o error state.frankiebee2017-06-281-1/+10
| * | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-283-0/+51
| |\ \ \
| * | | | fix nonceTrackerfrankiebee2017-06-221-38/+13
| * | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-171-35/+68
| |\ \ \ \
| * | | | | transaction controller - use nonce-trackerkumavis2017-06-151-32/+58
* | | | | | add "nonce too low" to the ignored errs list for tx retrysfrankiebee2017-07-131-0/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogickumavis2017-07-121-12/+1
|\ \ \ \ \
| * | | | | Improve insufficient balance checking in retry loopDan Finlay2017-07-121-4/+1
| * | | | | Remove local nonce error setting.Dan Finlay2017-07-121-8/+0
* | | | | | use .includesfrankiebee2017-07-121-3/+3
* | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ov...frankiebee2017-07-121-1/+3
|/ / / / /
* | | | | tx controller - resubmit - correctly set error on bad nonce/balancekumavis2017-07-081-2/+2
* | | | | tx controller - correctly set error message on resubmit errorkumavis2017-07-081-4/+8
* | | | | tx controller - resubmit - recognize parity known hash messagekumavis2017-07-081-0/+1
| |_|_|/ |/| | |
* | | | fail transactions that fail in resubmitfrankiebee2017-07-071-25/+22
* | | | tx controller - clean codekumavis2017-07-071-13/+14
* | | | tx controller - move commentskumavis2017-07-071-3/+7
* | | | add commentfrankiebee2017-07-071-5/+11
* | | | if an error happens during a tx publication set tx status to failfrankiebee2017-07-071-1/+10
* | | | Fix failing testDan Finlay2017-07-061-12/+6
* | | | Fail pending txs with low balance or invalid nonceDan Finlay2017-07-061-4/+22
* | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-291-4/+25
|\ \ \ \
| * \ \ \ Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-201-35/+68
| |\ \ \ \
| * | | | | Add ability to add tokens to token listDan Finlay2017-06-161-4/+25
* | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-283-1/+51
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | |_|_|_|/ | |/| | | |
* | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
| |/ / / / |/| | | |
* | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-271-0/+42
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+1
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-0/+42
| |/ / /
* | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-202-1/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+5
| |\|
| * | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
| * | Persist selected account tabDan Finlay2017-06-151-0/+8
| * | Merge branch 'master' into AddTokenListDan Finlay2017-06-135-14/+596
| |\ \
* | \ \ Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-3/+2
|\ \ \ \
| * | | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
* | | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
* | | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-16/+52
|\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 14:47:30 +0800