aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into inpage-provider-fixeskumavis2017-08-296-34/+140
|\
| * Version 3.9.11v3.9.11Dan Finlay2017-08-241-1/+1
| * Merge pull request #1973 from MetaMask/hotfix-migration019kumavis2017-08-243-1/+85
| |\
| | * fall back to `latest` if blockNumber is nullfrankiebee2017-08-241-1/+1
| | * Make method return a numberDan Finlay2017-08-241-1/+1
| | * Only cancel pending txs with non continuously high noncesDan Finlay2017-08-241-1/+24
| | * fix descriptionfrankiebee2017-08-241-2/+2
| | * hotfix - fail submitted txs whos nonce is out of boundfrankiebee2017-08-242-0/+61
| * | Fail transactions after a day of retriesDan Finlay2017-08-242-2/+12
| |/
| * Enforce nonces as type stringDan Finlay2017-08-241-2/+10
| * Use toNumber methodDan Finlay2017-08-241-2/+1
| * Fix network nonce parsingDan Finlay2017-08-241-4/+11
| * Pass nonce testsDan Finlay2017-08-241-8/+7
| * Got all tests but one passingDan Finlay2017-08-241-0/+1
| * Fix new test, break an older maybe wrong oneDan Finlay2017-08-241-26/+24
| * LintedDan Finlay2017-08-241-1/+0
| * Simplify nonce calculationDan Finlay2017-08-241-4/+5
* | inpage - lint fixkumavis2017-08-291-1/+1
* | inpage provider - autoreload - improve readabilitykumavis2017-08-241-15/+32
* | inpage provider - only warn web3 usage once per sessionkumavis2017-08-241-6/+11
* | inpage provider - sync rpc - default to null valueskumavis2017-08-241-3/+3
|/
* Version 3.9.10Dan Finlay2017-08-241-1/+1
* Merge branch 'master' into useLocalNonceDan Finlay2017-08-245-17/+110
|\
| * Version 3.9.9v3.9.9Dan Finlay2017-08-191-1/+1
| * Merge pull request #1914 from MetaMask/history-diffDan Finlay2017-08-194-16/+109
| |\
| | * migration 18 - activatekumavis2017-08-151-0/+1
| | * migration 18 - fix an oopskumavis2017-08-151-1/+1
| | * tx controller - tx state history various small fixeskumavis2017-08-153-3/+2
| | * migration 18 - move to diff-based historykumavis2017-08-151-0/+52
| | * introduce tx-state-history-helper and diff-based historykumavis2017-08-152-15/+56
* | | nonce-tracker - more debugging numbers for nonceDetailskumavis2017-08-231-10/+8
* | | remove unused codekumavis2017-08-231-15/+0
* | | nonce-tracker - use ethjs-querykumavis2017-08-231-11/+2
* | | nonce-tracker - fix var namekumavis2017-08-231-4/+4
* | | nonce-tracker - getlocalNextNonce - add entry to nonceDetailskumavis2017-08-231-1/+1
* | | nonce-tracker - simplify _getlocalNextNoncekumavis2017-08-231-20/+29
* | | nonce-tracker - simplify getHighestNoncekumavis2017-08-231-5/+3
* | | nonce-tracker - getHighestNonce doesnt need uniqued inputkumavis2017-08-231-4/+4
* | | nonce-tracker - make nonce strategy api and naming more symmeticalkumavis2017-08-231-19/+21
* | | nonce-tracker - pass testsfrankiebee2017-08-221-5/+4
* | | clean up codefrankiebee2017-08-221-39/+43
* | | nonce-tracker - pass testsfrankiebee2017-08-221-11/+38
* | | break out network nonce calc.frankiebee2017-08-191-17/+21
* | | fix 0x0 nonce calc.frankiebee2017-08-191-8/+18
* | | include pendingTxs in localNoncefrankiebee2017-08-191-10/+9
* | | use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-192-3/+27
|/ /
* | Version 3.9.8v3.9.8Dan Finlay2017-08-171-1/+1
* | v3.9.7kumavis2017-08-161-1/+1
|/
* fix wordingfrankiebee2017-08-121-1/+1
* add deprecation warning for web3frankiebee2017-08-121-1/+4
* 3.9.6kumavis2017-08-101-1/+1
* Merge pull request #1883 from MetaMask/estimateGas-fixThomas Huang2017-08-101-3/+11
|\
| * tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
* | ui - buy eth - formatting and moved network names to configkumavis2017-08-101-0/+5
|/
* tx controller - fix error serializationkumavis2017-08-091-2/+5
* tx controller - fix getBalance fnkumavis2017-08-091-1/+1
* util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
* Merge pull request #1880 from MetaMask/pendingFixFrankie2017-08-092-3/+4
|\
| * filter by network for pending txsfrankiebee2017-08-091-0/+2
| * fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-092-3/+2
* | Merge branch 'master' into greenkeeper/initialkumavis2017-08-094-186/+241
|\|
| * fix class namesfrankiebee2017-08-093-18/+25
| * fix the bind on pending tx watchersfrankiebee2017-08-081-3/+3
| * Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-084-5/+19
| |\
| * | remove logging of the message and log the errorfrankiebee2017-08-081-1/+1
| * | remove unnecessary if statment for error messagefrankiebee2017-08-081-1/+0
| * | fix spellingfrankiebee2017-08-082-15/+12
| * | rename PendingTransactionUtils -> PendingTransactionWatchersfrankiebee2017-08-051-8/+8
| * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0512-125/+118
| |\ \
| * | | break out tx status pendding watchersfrankiebee2017-08-052-145/+192
| * | | move util functions to util.jsfrankiebee2017-08-052-32/+40
| * | | use error for #approveTransaction when setting failedfrankiebee2017-08-031-5/+2
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-085-6/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into NewUIkumavis2017-08-052-3/+4
| |\ \ \
| | * | | v3.9.5kumavis2017-08-051-1/+1
| | * | | blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-051-2/+3
| * | | | Merge branch 'master' into NewUIkumavis2017-08-041-1/+1
| |\| | |
| | * | | v3.9.4kumavis2017-08-041-1/+1
| | | |/ | | |/|
| * | | Merge branch 'master' into NewUIkumavis2017-08-044-35/+21
| |\| |
| | * | Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-041-1/+2
| | |\ \
| | | * | fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-1/+2
| | * | | v3.9.3kumavis2017-08-041-1/+1
| | * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r...kumavis2017-08-041-3/+0
| | |\ \ \
| | * | | | blacklist - use module eth-phishing-detectkumavis2017-08-042-33/+18
| | | |/ / | | |/| |
| * | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-042-2/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Create distinct responsive 'home.html' file, hard-code popup.html sizeDan Finlay2017-07-292-1/+13
| | * | | Correct viewport paramDan Finlay2017-07-281-1/+1
| | * | | Merge branch 'master' into NewUIDan Finlay2017-07-286-40/+95
| | |\ \ \
| | * \ \ \ Merge branch 'master' into NewUIDan Finlay2017-07-286-34/+104
| | |\ \ \ \
| | * | | | | Disable user zoom in mobile modeDan Finlay2017-07-281-1/+1
| | * | | | | Fix viewport width to 1Dan Finlay2017-07-281-1/+1
| | * | | | | Adjust mobile scale for smaller devicesDan Finlay2017-07-271-1/+1
| | * | | | | Set initial scale for mobile.Dan Finlay2017-07-271-1/+2
| | * | | | | Replace ui with responsive-uiDan Finlay2017-07-253-95/+0
| | * | | | | Merge branch 'master' into NewUIDan Finlay2017-07-2112-156/+364
| | |\ \ \ \ \
| | * | | | | | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-214-4/+4
| | * | | | | | Merge branch 'master' into NewUIDan Finlay2017-07-062-3/+10
| | |\ \ \ \ \ \
| | * | | | | | | Get duplicate UI template workingDan Finlay2017-07-042-6/+3
| | * | | | | | | Make folder for responsive UIDan Finlay2017-07-044-3/+57
| | * | | | | | | Began creating new UI templateDan Finlay2017-07-043-1/+46
| * | | | | | | | remove stack from txsfrankiebee2017-08-041-3/+0
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-034-247/+191
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | use async with #publishTransactionfrankiebee2017-08-031-2/+2
| | * | | | | | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-034-51/+49
| | * | | | | | lint fixesfrankiebee2017-08-023-11/+4
| | * | | | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-028-21/+126
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | fix spelling mistakefrankiebee2017-08-021-1/+1
| | * | | | | | fix addTxDefaultsfrankiebee2017-08-022-2/+3
| | * | | | | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-023-218/+168
| * | | | | | | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-034-47/+67
| * | | | | | | phishing detection - move phishing detection into contentscript and metamask ...kumavis2017-08-037-64/+50
| * | | | | | | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| | |/ / / / / | |/| | | | |
| * | | | | | Do not blacklist filesDan Finlay2017-07-281-1/+0
| * | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-272-2/+41
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #1837 from MetaMask/i1833-levencheckDan Finlay2017-07-271-8/+36
| | |\ \ \ \ \
| | | * | | | | Give credit where it is dueKevin Serrano2017-07-271-0/+4
| | | * | | | | Add levenshtein logic to blacklister.Kevin Serrano2017-07-271-8/+32
| * | | | | | | Live update blacklist from InfuraDan Finlay2017-07-274-13/+15
| * | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-273-7/+13
| |\| | | | | |
| | * | | | | | Version 3.9.2v3.9.2Dan Finlay2017-07-271-1/+1
| | |/ / / / /
| | * | | | | nonce-tracker - hotfix for provider proxyingkumavis2017-07-272-5/+11
| | * | | | | nonce-tracker - add raw baseNonceHex to nonceDetailskumavis2017-07-271-1/+1
| * | | | | | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-273-8/+52
| |/ / / / /
| * | | | | 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
| |\| | | |
| | * | | | Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten...frankiebee2017-07-262-7/+8
| | |\ \ \ \
| | * | | | | fix typofrankiebee2017-07-261-1/+1
| * | | | | | tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-272-2/+9
| * | | | | | nonce-tracker - validation - add validation failing value type to error messagekumavis2017-07-271-3/+3
| * | | | | | nonce-tracker - validation - add validation failing value to error messagekumavis2017-07-271-3/+3
| | |/ / / / | |/| | | |
| * | | | | 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 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-262-8/+30
| |/ / /
| * | | Version 3.9.1v3.9.1Dan Finlay2017-07-201-1/+1
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0415-289/+351
* | | | lint fixeskumavis2017-08-041-1/+1
|/ / /
* | | transactions - block nonce-tracker while updating pending transactionskumavis2017-07-192-14/+32
* | | nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-191-11/+15
* | | transaction - promisify _checkPendingTxskumavis2017-07-191-27/+41
* | | nonce-tracker - return nonce as integerkumavis2017-07-191-1/+1
* | | nonce-tracker - validate nonce calc componentskumavis2017-07-191-3/+9
* | | turn off auto faucet and remove filefrankiebee2017-07-182-24/+0
* | | Infura Network response teststmashuang2017-07-151-0/+1
* | | Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-145-96/+149
|\ \ \
| * | | make publishTransaction and signTransaction async methodsfrankiebee2017-07-142-21/+19
| * | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-132-2/+2
| |\ \ \
| * | | | Fix test to match behaviorfrankiebee2017-07-131-1/+1
| * | | | mv updateAndApproveTx to txControllerfrankiebee2017-07-131-3/+7
| * | | | use new nodeifyfrankiebee2017-07-132-44/+21
| * | | | Use txParamsfrankiebee2017-07-121-4/+4
| * | | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-125-21/+68
| |\ \ \ \
| * \ \ \ \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i...frankiebee2017-07-126-26/+121
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into nonce-trackerkumavis2017-07-086-26/+121
| | |\ \ \ \ \
| * | | | | | | remove irrelevan codefrankiebee2017-07-121-1/+0
| |/ / / / / /
| * | | | | | clean up unused code from old noncelockfrankiebee2017-07-061-2/+0
| * | | | | | fix nonce calculation orderfrankiebee2017-07-061-6/+7
| * | | | | | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-282-7/+15
| * | | | | | calculate nonce based on local pending txs w/o error state.frankiebee2017-06-281-1/+10
| * | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-285-2/+67
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into nonce-trackerfrankiebee2017-06-221-1/+3
| |\ \ \ \ \ \ \
| * | | | | | | | fix nonceTrackerfrankiebee2017-06-222-46/+19
| * | | | | | | | add a test for #getNonceLockfrankiebee2017-06-221-6/+16
| * | | | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-172-36/+74
| |\ \ \ \ \ \ \ \
| * | | | | | | | | transaction controller - use nonce-trackerkumavis2017-06-152-33/+59
| * | | | | | | | | introduce nonce-trackerkumavis2017-06-151-0/+49
* | | | | | | | | | Redirect from malicious sites fasterDan Finlay2017-07-141-1/+1
* | | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIstkumavis2017-07-133-0/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | limit the range for retryCountfrankiebee2017-07-131-1/+1
| * | | | | | | | | | write a migration for resubmit tx's to get put back into a submitted statefrankiebee2017-07-132-0/+41
| * | | | | | | | | | add "nonce too low" to the ignored errs list for tx retrysfrankiebee2017-07-131-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Remove css referencev3.9.0Dan Finlay2017-07-131-2/+1
* | | | | | | | | | Version 3.9.0Dan Finlay2017-07-131-1/+1
* | | | | | | | | | Merge branch 'master' into Version-3.8.6Dan Finlay2017-07-132-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add first version of phishing site warningDan Finlay2017-07-132-0/+19
| |/ / / / / / / / /
* / / / / / / / / / Version 3.8.6v3.8.6Dan Finlay2017-07-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' into 3.8.5Dan Finlay2017-07-125-21/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | metamask - on rpc err show whole error bodykumavis2017-07-121-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogickumavis2017-07-122-12/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve insufficient balance checking in retry loopDan Finlay2017-07-122-4/+10
| | * | | | | | | | 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
| |/ / / / / / / /
| * | | | | | | | migration 16 - move resubmit warning back to submitted statekumavis2017-07-082-0/+42
| * | | | | | | | 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
* | | | | | | | | 3.8.5kumavis2017-07-081-1/+1
|/ / / / / / / /
* | | | | / / / Version 3.8.4v3.8.4Dan Finlay2017-07-081-1/+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
* | | | | | | Version 3.8.3v3.8.3Dan Finlay2017-07-071-1/+1
* | | | | | | Fix failing testDan Finlay2017-07-061-12/+6
* | | | | | | Fail pending txs with low balance or invalid nonceDan Finlay2017-07-061-4/+22
| |_|_|_|_|/ |/| | | | |
* | | | | | metamask - append dapp origin domain to rpc requestkumavis2017-07-051-2/+9
* | | | | | Version 3.8.2v3.8.2Dan Finlay2017-07-041-1/+1
| |_|_|_|/ |/| | | |
* | | | | Version 3.8.1v3.8.1Dan Finlay2017-07-011-1/+1
* | | | | Version 3.8.0v3.8.0Dan Finlay2017-06-291-1/+1
* | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-292-4/+26
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-231-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-202-36/+74
| |\ \ \ \ \ \
| * | | | | | | Add ability to add tokens to token listDan Finlay2017-06-162-4/+26
* | | | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-286-4/+70
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #1685 from MetaMask/setFailedDan Finlay2017-06-282-0/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting tx.'...frankiebee2017-06-282-0/+39
| | |/ / / / / / | |/| | | | | |
* / | | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
|/ / / / / / /
* | | | | | | Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
* | | | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-272-1/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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-232-1/+56
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-233-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-203-1/+10
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | 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-152-0/+9
| | * | Merge branch 'master' into AddTokenListDan Finlay2017-06-1342-379/+552
| | |\ \
| | * | | Add missing tx manager stateDan Finlay2017-04-251-0/+1
* | | | | Fix badge number to include personal_signKevin Serrano2017-06-211-1/+3
|/ / / /
* | | | Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-3/+2
|\ \ \ \
| * \ \ \ Merge pull request #1623 from MetaMask/checkTxsFrankie2017-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-171-1/+5
|\| | | | |
| * | | | | Debounce background updatesDan Finlay2017-06-161-1/+5
| |/ / / /
* | | | | 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-162-11/+17
* | | | 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
| |_|/ |/| |
* | | Version 3.7.8v3.7.8Dan Finlay2017-06-131-1/+1
|/ /
* | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-131-2/+5
|\ \
| * | default testnet - fix typokumavis2017-06-131-1/+0
| * | Merge branch 'master' into i#1203MainNetSwitchkumavis2017-06-1354-1182/+929
| |\ \
| * \ \ Merge branch 'master' into i#1203MainNetSwitchFrankie2017-03-173-1/+97
| |\ \ \
| * \ \ \ Merge branch 'master' into i#1203MainNetSwitchkumavis2017-03-153-3/+3
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 15:38:17 +0800