aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3Kevin Serrano2017-08-041-1/+1
|\
| * deps - bump eth-detect-phishingkumavis2017-08-041-1/+1
* | Merge pull request #1852 from MetaMask/blacklist-refactor2Kevin Serrano2017-08-043-35/+20
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r...kumavis2017-08-041-3/+0
| |\ | |/ |/|
* | Merge pull request #1850 from MetaMask/stackKevin Serrano2017-08-041-3/+0
|\ \
| * | remove stack from txsfrankiebee2017-08-041-3/+0
|/ /
| * blacklist - use module eth-phishing-detectkumavis2017-08-043-35/+20
|/
* Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-036-272/+331
|\
| * remove unused sinonfrankiebee2017-08-031-1/+0
| * use async with #publishTransactionfrankiebee2017-08-031-2/+2
| * fix testfrankiebee2017-08-031-1/+1
| * move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-035-54/+115
| * lint fixesfrankiebee2017-08-023-11/+4
| * Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0213-25/+163
| |\
| * | fix spelling mistakefrankiebee2017-08-021-1/+1
| * | fix addTxDefaultsfrankiebee2017-08-022-2/+3
| * | add test for addTxDefaultsfrankiebee2017-08-021-5/+30
| * | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-026-241/+219
* | | Merge pull request #1849 from MetaMask/blacklist-refactorKevin Serrano2017-08-0314-130/+156
|\ \ \ | |_|/ |/| |
| * | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-036-83/+108
| * | phishing detection - move phishing detection into contentscript and metamask ...kumavis2017-08-0310-67/+52
| * | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| * | blacklist - add tests for metamask subdomainskumavis2017-08-021-0/+12
| * | blacklist - clearer test formatkumavis2017-08-021-5/+5
|/ /
* | Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdatingKevin Serrano2017-07-288-44/+103
|\ \
| * | Do not blacklist filesDan Finlay2017-07-281-1/+0
| * | Add Levenshtein item to changelogDan Finlay2017-07-271-0/+1
| * | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-275-2/+67
| |\ \ | |/ / |/| |
* | | Merge pull request #1837 from MetaMask/i1833-levencheckDan Finlay2017-07-274-8/+62
|\ \ \
| * | | Give credit where it is dueKevin Serrano2017-07-272-1/+5
| * | | Changelog bumpKevin Serrano2017-07-271-0/+1
| * | | Add levenshtein logic to blacklister.Kevin Serrano2017-07-272-8/+33
| * | | Add test for blacklister.Kevin Serrano2017-07-271-0/+24
| | * | Live update blacklist from InfuraDan Finlay2017-07-275-13/+17
| | * | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-275-10/+21
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1834 from MetaMask/Version-3.9.2Kevin Serrano2017-07-272-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Version 3.9.2v3.9.2Dan Finlay2017-07-272-1/+4
|/ / /
* | | Merge pull request #1830 from MetaMask/providerProxyFixFrankie2017-07-273-9/+17
|\ \ \
| * | | nonce-tracker - fix testkumavis2017-07-271-3/+5
| * | | 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
| |/ / |/| |
* | | Merge pull request #1829 from MetaMask/betterErrorsOnTxDan Finlay2017-07-272-4/+9
|\| |
| * | tx cont - dont recursively store historykumavis2017-07-271-3/+9
| * | logState - dont redundantly log to consolekumavis2017-07-271-1/+0
* | | Merge pull request #1828 from MetaMask/betterErrorsOnTxFrankie2017-07-272-5/+12
|\| | | |/ |/|
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterError...kumavis2017-07-275-3/+13
| |\ | |/ |/|
* | Merge pull request #1827 from MetaMask/test-coverageThomas Huang2017-07-261-1/+1
|\ \
| * | Coveralls badge directs to master branchThomas Huang2017-07-261-1/+1
* | | Merge pull request #1816 from MetaMask/test-coveragekumavis2017-07-264-2/+12
|\| |
| * | Run coveralls on all branchesThomas Huang2017-07-261-1/+1
| * | One script runs for Ci buildThomas Huang2017-07-262-3/+2
| * | Simplify the test-coverage scriptThomas Huang2017-07-251-1/+1
| * | Add coveralls to scriptThomas Huang2017-07-251-1/+1
| * | Configure ci build to run tests individuallyThomas Huang2017-07-241-0/+5
| * | Add Test Coverage with nyc package and coveralls for github badgeThomas Huang2017-07-243-2/+8
* | | Merge pull request #1823 from MetaMask/betterErrorsOnTxkumavis2017-07-263-8/+32
|\ \ \
| * \ \ Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten...frankiebee2017-07-265-25/+36
| |\ \ \
| * | | | 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-265-25/+36
| |/| | | |/ / |/| |
* | | Merge pull request #1824 from MetaMask/tx-cont-fixFrankie2017-07-264-24/+35
|\ \ \
| * | | tx cont - fix test to use async apikumavis2017-07-261-2/+6
| * | | tx cont - add argument for provider constructorkumavis2017-07-262-17/+24
| * | | tx cont - remove old cb from async fnkumavis2017-07-261-5/+5
| | |/ | |/|
* | | Merge pull request #1821 from MetaMask/fetch-retry-2Dan Finlay2017-07-261-1/+1
|\ \ \ | |/ / |/| |
| * | prov-eng - bump to ignore json parse errorskumavis2017-07-261-1/+1
|/ /
| * fix stack wordingfrankiebee2017-07-261-2/+2
| * use clonefrankiebee2017-07-262-2/+1
| * remove line numbersfrankiebee2017-07-261-3/+3
| * Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-264-8/+33
|/
* Merge pull request #1801 from MetaMask/i1800-UpdateTutorialLinkKevin Serrano2017-07-211-1/+11
|\
| * Add user support linkDan Finlay2017-07-211-0/+4
| * Update tutorial linksDan Finlay2017-07-211-1/+7
|/
* Merge pull request #1799 from MetaMask/Version-3.9.1kumavis2017-07-203-2/+4
|\
| * Version 3.9.1v3.9.1Dan Finlay2017-07-203-2/+4
|/
* Merge pull request #1796 from MetaMask/1GweiMinGasPricekumavis2017-07-202-1/+2
|\
| * Lowered minimum gas price to 1 gweiDan Finlay2017-07-202-1/+2
|/
* Merge pull request #1794 from MetaMask/nonce-tracker-fixesDan Finlay2017-07-194-44/+88
|\
| * changelog - add nonce-tracker notekumavis2017-07-191-0/+1
| * transactions - block nonce-tracker while updating pending transactionskumavis2017-07-192-14/+32
| * nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-192-11/+16
| * 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
|/
* Merge pull request #1787 from MetaMask/i1637-TransactionOrderkumavis2017-07-193-1/+23
|\
| * Fix transaction confirmation orderingDan Finlay2017-07-183-1/+23
* | Merge pull request #1791 from MetaMask/ciBadgekumavis2017-07-191-1/+1
|\ \
| * | Shield looks bettertmashuang2017-07-191-1/+1
| * | Change Ci Badge url for readmetmashuang2017-07-191-1/+1
|/ /
* | Merge pull request #1786 from MetaMask/turnOffAutoFaucetDan Finlay2017-07-183-24/+1
|\ \ | |/ |/|
| * turn off auto faucet and remove filefrankiebee2017-07-183-24/+1
|/
* Merge pull request #1781 from MetaMask/AddSupportLinkKevin Serrano2017-07-182-2/+9
|\
| * Add support page link to help pageDan Finlay2017-07-182-2/+9
|/
* Merge pull request #1777 from MetaMask/InfuraTestkumavis2017-07-153-35/+64
|\
| * Sinon stub infura network statustmashuang2017-07-151-14/+18
| * Update Sinontmashuang2017-07-151-1/+1
| * Use Let instead of vartmashuang2017-07-151-1/+1
| * Infura Network response teststmashuang2017-07-152-34/+59
|/
* Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-149-121/+205
|\
| * make publishTransaction and signTransaction async methodsfrankiebee2017-07-143-32/+28
| * remove denodeifyfrankiebee2017-07-141-1/+0
| * Merge branch 'master' into nonce-trackerfrankiebee2017-07-135-36/+40
| |\
| * | Fix test to match behaviorfrankiebee2017-07-132-2/+2
| * | 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-127-21/+113
| |\ \
| * \ \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i...frankiebee2017-07-1225-129/+689
| |\ \ \
| | * | | test - tx controller - fix promise handlingkumavis2017-07-081-5/+2
| | * | | test - tx-controller - stub block-tracker methodkumavis2017-07-081-1/+1
| | * | | Merge branch 'master' into nonce-trackerkumavis2017-07-0825-123/+686
| | |\ \ \
| * | | | | 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-2826-56/+507
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into nonce-trackerfrankiebee2017-06-225-16/+7
| |\ \ \ \ \
| * | | | | | fix nonceTrackerfrankiebee2017-06-223-58/+25
| * | | | | | add a test for #getNonceLockfrankiebee2017-06-223-6/+63
| * | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-175-38/+92
| |\ \ \ \ \ \
| * | | | | | | remove irrelevant testfrankiebee2017-06-171-5/+0
| * | | | | | | Fix test to call donefrankiebee2017-06-161-7/+8
| * | | | | | | transaction controller - use nonce-trackerkumavis2017-06-153-36/+63
| * | | | | | | introduce nonce-trackerkumavis2017-06-151-0/+49
* | | | | | | | Merge pull request #1775 from MetaMask/BlacklistFasterkumavis2017-07-142-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Redirect from malicious sites fasterDan Finlay2017-07-142-1/+3
|/ / / / / / / /
* | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #1770 from MetaMask/Version-3.9.0kumavis2017-07-132-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove css referencev3.9.0Dan Finlay2017-07-131-2/+1
| * | | | | | | | Version 3.9.0Dan Finlay2017-07-132-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #1769 from MetaMask/UpdateMetadatakumavis2017-07-131-2/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into UpdateMetadataDan Finlay2017-07-136-2/+24
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update eth-contract-metadata on buildDan Finlay2017-07-131-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1765 from MetaMask/Version-3.8.6kumavis2017-07-132-1/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into Version-3.8.6Dan Finlay2017-07-136-2/+25
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1768 from MetaMask/AddBlacklistkumavis2017-07-136-2/+24
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Refresh blacklist before distDan Finlay2017-07-131-1/+1
| * | | | | | | | Correct github linkDan Finlay2017-07-131-1/+1
| * | | | | | | | Bump node versionDan Finlay2017-07-131-1/+1
| * | | | | | | | Point blacklist at main repositoryDan Finlay2017-07-131-1/+1
| * | | | | | | | Bump changelogDan Finlay2017-07-131-0/+1
| * | | | | | | | Add first version of phishing site warningDan Finlay2017-07-134-0/+21
|/ / / / / / / /
| * / / / / / / Version 3.8.6v3.8.6Dan Finlay2017-07-122-1/+4
|/ / / / / / /
* | | | | | | Merge pull request #1758 from MetaMask/3.8.5Dan Finlay2017-07-122-1/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 3.8.5Dan Finlay2017-07-129-55/+143
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1763 from MetaMask/prov-bumpkumavis2017-07-123-35/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | deps - bump prov-engkumavis2017-07-121-1/+1
| * | | | | | | tests - disable infura testkumavis2017-07-121-33/+33
| * | | | | | | deps - bump prov-eng for fetch retrykumavis2017-07-121-1/+1
| * | | | | | | metamask - on rpc err show whole error bodykumavis2017-07-121-1/+1
| * | | | | | | deps - bump prov-eng for retry on gateway timeoutkumavis2017-07-121-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogickumavis2017-07-124-12/+51
|\ \ \ \ \ \ \
| * | | | | | | Improve insufficient balance checking in retry loopDan Finlay2017-07-124-4/+49
| * | | | | | | Remove local nonce error setting.Dan Finlay2017-07-122-8/+2
* | | | | | | | Merge pull request #1761 from MetaMask/resubmimtErrorskumavis2017-07-121-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | use .includesfrankiebee2017-07-121-3/+3
| * | | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ov...frankiebee2017-07-121-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #1757 from MetaMask/resubmit-fixv3.8.5Frankie2017-07-083-6/+53
|\ \ \ \ \ \ \
| * | | | | | | 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-082-1/+5
|/ / / / / /
* | | | | | Merge pull request #1754 from MetaMask/Version-3.8.4kumavis2017-07-082-1/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Version 3.8.4v3.8.4Dan Finlay2017-07-082-1/+5
|/ / / / /
* | | | | Merge pull request #1750 from MetaMask/failIfErrorkumavis2017-07-071-4/+21
|\ \ \ \ \
| * | | | | 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
|/ / / / /
* | | | | Merge pull request #1748 from MetaMask/Version-3.8.3Thomas Huang2017-07-072-1/+3
|\ \ \ \ \
| * | | | | Version 3.8.3v3.8.3Dan Finlay2017-07-072-1/+3
|/ / / / /
* | | | | Merge pull request #1747 from MetaMask/FailingTestForFailingLowBalanceTxDan Finlay2017-07-073-4/+57
|\ \ \ \ \
| * | | | | Bump changelogDan Finlay2017-07-061-0/+1
| * | | | | Fix failing testDan Finlay2017-07-062-39/+35
| * | | | | Add missing doneDan Finlay2017-07-061-1/+2
| * | | | | Typo fixDan Finlay2017-07-061-1/+1
| * | | | | Merge branch 'FailLowBalance' into FailingTestForFailingLowBalanceTxDan Finlay2017-07-061-4/+22
| |\ \ \ \ \
| | * | | | | Fail pending txs with low balance or invalid nonceDan Finlay2017-07-061-4/+22
| * | | | | | Add failing test for retrying an over-spending txDan Finlay2017-07-061-0/+37
| |/ / / / /
* | | | | | Merge pull request #1742 from MetaMask/TokenSymbolMisspelledkumavis2017-07-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix spellingtmashuang2017-07-061-1/+1
|/ / / / /
* | | | | Merge pull request #1741 from MetaMask/ReEnableTokenListkumavis2017-07-062-2/+3
|\ \ \ \ \
| * | | | | Reenable Default Token ListDan Finlay2017-07-062-2/+3
|/ / / / /
* | | | | Merge pull request #1739 from MetaMask/origin-headerDan Finlay2017-07-062-4/+11
|\ \ \ \ \
| * | | | | metamask - append dapp origin domain to rpc requestkumavis2017-07-052-4/+11
|/ / / / /
* | | | | Merge pull request #1733 from MetaMask/Version-3.8.2Thomas Huang2017-07-042-1/+3
|\ \ \ \ \
| * | | | | Version 3.8.2v3.8.2Dan Finlay2017-07-042-1/+3
|/ / / / /
* | | | | Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfigKevin Serrano2017-07-042-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i1720-NoSpinnerOnConfigKevin Serrano2017-07-043-23/+49
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1729 from MetaMask/i1707-ClarifySearchingIndicationKevin Serrano2017-07-043-23/+50
|\ \ \ \ \ \
| * | | | | | Bump changelogDan Finlay2017-07-041-0/+3
| * | | | | | Indicate which network is being searched forDan Finlay2017-07-041-1/+22
| * | | | | | Add menu carrat next to network searching indicatorDan Finlay2017-07-042-22/+25
|/ / / / / /
| * / / / / No longer show network spinner on config screenDan Finlay2017-07-042-1/+3
|/ / / / /
* | | | | Merge pull request #1714 from MetaMask/Version-3.8.1Thomas Huang2017-07-012-1/+3
|\ \ \ \ \
| * | | | | Version 3.8.1v3.8.1Dan Finlay2017-07-012-1/+3
|/ / / / /
* | | | | Merge pull request #1711 from MetaMask/NoPopularTOkensThomas Huang2017-07-012-1/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into NoPopularTOkensThomas Huang2017-07-013-1/+7
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1712 from MetaMask/RemoveTokenSendingThomas Huang2017-07-012-0/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into RemoveTokenSendingThomas Huang2017-07-012-1/+4
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1710 from MetaMask/BumpTokenTrackerThomas Huang2017-07-012-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Bump token-tracker to 1.1.2Dan Finlay2017-07-012-1/+2
| * | | | | | | Bump token-tracker to 1.1.1Dan Finlay2017-07-012-1/+4
|/ / / / / / /
| * / / / / / Remove send buttonDan Finlay2017-07-012-0/+4
|/ / / / / /
| * / / / / Stop loading popular tokens by defaultDan Finlay2017-07-012-1/+5
|/ / / / /
* | | | | Merge pull request #1703 from MetaMask/deps-dedupeKevin Serrano2017-06-301-3/+1
|\ \ \ \ \
| * | | | | deps - remove duplicated dev-dependencieskumavis2017-06-301-3/+1
|/ / / / /
* | | | | Merge pull request #1701 from MetaMask/BumpWeb3Kevin Serrano2017-06-301-1/+1
|\ \ \ \ \
| * | | | | Bump web3 version to 0.9.1Dan Finlay2017-06-301-1/+1
* | | | | | Merge pull request #1700 from MetaMask/StyleImprovementsKevin Serrano2017-06-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add padding to token messagesDan Finlay2017-06-291-0/+1
* | | | | | Merge pull request #1699 from MetaMask/change-send-wordingThomas Huang2017-06-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | change “ACCEPT” to “SUBMIT”frankiebee2017-06-301-1/+1
|/ / / / /
* | | | | Merge pull request #1691 from MetaMask/Version-3.8.0Kevin Serrano2017-06-292-1/+3
|\ \ \ \ \
| * | | | | Version 3.8.0v3.8.0Dan Finlay2017-06-292-1/+3
|/ / / / /
* | | | | Merge pull request #1690 from MetaMask/i1669-StateCopyButtonThomas Huang2017-06-292-0/+29
|\ \ \ \ \
| * | | | | Add copy state logs buttonDan Finlay2017-06-292-0/+29
* | | | | | Merge pull request #1634 from MetaMask/i784-SendTokenButtonThomas Huang2017-06-292-7/+30
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-285-22/+45
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-241-7/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into i784-SendTokenButtonDan Finlay2017-06-237-18/+34
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix propagationDan Finlay2017-06-201-1/+1
| * | | | | | | | | Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-207-49/+95
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add send button to TokenFactoryDan Finlay2017-06-202-7/+30
* | | | | | | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-2912-57/+397
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove token contract validation stepDan Finlay2017-06-281-13/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-06-280-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Support other network linksDan Finlay2017-06-283-19/+27
| * | | | | | | | | | Do not allow adding non token addressesDan Finlay2017-06-281-1/+13
| * | | | | | | | | | Support other network linksDan Finlay2017-06-283-19/+27
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'i1616-AddTokenAdding' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-06-281-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix Back Button on Add Token ViewThomas Huang2017-06-271-1/+2
| | | |_|_|/ / / / / | | |/| | | | | | |
| * / | | | | | | | Fix token adding bugDan Finlay2017-06-281-1/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-237-18/+34
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Reduce token list clutter by only showing held tokensDan Finlay2017-06-201-7/+4
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-207-49/+95
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Add ability to add tokens to token listDan Finlay2017-06-167-21/+78
| * | | | | | | Make add token screen a fully working formDan Finlay2017-06-161-11/+141
| * | | | | | | Merge branch 'AddTokenList' into AddingTokensDan Finlay2017-06-165-27/+20
| |\ \ \ \ \ \ \
| * | | | | | | | Remove logDan Finlay2017-06-161-1/+0
| * | | | | | | | Create add token button and template viewDan Finlay2017-06-156-24/+170
generated by cgit (git 2.34.1) at 2024-11-28 07:56:50 +0800