aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| |/
| * 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 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
| |\|
| | * 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
| | * | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-282-7/+10
| | |\ \ \ \ \
| | | * | | | | Update change logThomas Huang2017-06-281-0/+1
| | | * | | | | Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-2828-64/+514
| | | |\ \ \ \ \
| | | * | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | * | | | | | | Merge pull request #1681 from MetaMask/AddressStrippingDan Finlay2017-06-281-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove trailing periods and white spaceThomas Huang2017-06-281-1/+1
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #1688 from MetaMask/i1687-BackButtonImportScreenDan Finlay2017-06-281-0/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add Back Button for Import ScreenThomas Huang2017-06-281-0/+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
| | | |/ / / / / /
| | * | | | | | | Merge pull request #1675 from MetaMask/warning-fixesDan Finlay2017-06-282-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix react warning for keys on ens address bookKevin Serrano2017-06-271-1/+1
| | | * | | | | | | Fix react warning on create-vault-completeKevin Serrano2017-06-271-1/+1
| | * | | | | | | | Merge pull request #1683 from MetaMask/RenameSendToNextDan Finlay2017-06-281-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Rename Send to NextThomas Huang2017-06-281-1/+1
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge pull request #1684 from MetaMask/neverGiveUpThomas Huang2017-06-282-4/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-282-4/+1
| | |/ / / / / / /
* | / / / / / / / 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 pull request #1678 from MetaMask/i1584-seederrorThomas Huang2017-06-272-1/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into i1584-seederrorThomas Huang2017-06-272-2/+5
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1677 from MetaMask/i1676-quickclickThomas Huang2017-06-272-2/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Change disabling button as state property.Kevin Serrano2017-06-271-5/+4
| | * | | | | | | Bump changelog.Kevin Serrano2017-06-271-0/+1
| | * | | | | | | Prevent users from accidentally submitting two transactions by disabling button.Kevin Serrano2017-06-271-0/+3
| |/ / / / / / /
| | * | | | | | Bump changelog.Kevin Serrano2017-06-271-0/+1
| | * | | | | | Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-273-1/+90
| |\ \ \ \ \ \
| | * | | | | | remove option fetchfrankiebee2017-06-231-2/+1
| | * | | | | | add `done` and stub fetchfrankiebee2017-06-231-8/+9
| | * | | | | | Add test for infura controller.Kevin Serrano2017-06-231-0/+34
| | * | | | | | 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 #1674 from MetaMask/remove-mapsThomas Huang2017-06-272-8/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Simplify build variables. Remove maps from production.Kevin Serrano2017-06-272-8/+8
| |/ / / / / /
| * | | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-2322-45/+402
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Print integration build errorsDan Finlay2017-06-221-6/+8
| | * | | | | Bump circleCI node version to 8.0.0Dan Finlay2017-06-211-1/+1
| | * | | | | Add better event lifecycle management to token list.Dan Finlay2017-06-201-4/+18
| | | |_|_|/ | | |/| | |
| | * | | | Fix token balance renderingDan Finlay2017-06-201-1/+1
| | * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Dan Finlay2017-06-207-47/+93
| | |\ \ \ \
| | | * | | | Merge branch 'master' into AddTokenListKevin Serrano2017-06-201-9/+0
| | | |\| | |
| | | * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-2020-38/+379
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | * | / | | Add MetaMark supportDan Finlay2017-06-201-1/+1
| | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-165-27/+20
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Hide message on normal loadingDan Finlay2017-06-151-1/+3
| | * | | | Multiple loading style improvementsDan Finlay2017-06-152-8/+16
| | * | | | Remove excessive logDan Finlay2017-06-151-1/+0
| | * | | | Add no tokens messageDan Finlay2017-06-151-9/+13
| | * | | | Bump token-tracker versionDan Finlay2017-06-151-1/+1
| | * | | | Vertically center loading indicationDan Finlay2017-06-151-2/+10
| | * | | | Refresh token balance on network changeDan Finlay2017-06-153-7/+23
| | * | | | Persist selected account tabDan Finlay2017-06-156-14/+52
| | * | | | Rename history to sentDan Finlay2017-06-141-1/+1
| | * | | | Remove bad state fileDan Finlay2017-06-141-93/+0
| | * | | | Add token list note to changelogDan Finlay2017-06-141-0/+2
| | * | | | Auto populate token list with popular token balancesDan Finlay2017-06-147-32/+68
| | * | | | Fix build for eth-contract-metadataDan Finlay2017-06-142-2/+2
| | * | | | Merge branch 'master' into AddTokenListDan Finlay2017-06-13160-7504/+3175
| | |\ \ \ \
| | * | | | | Add missing tx manager stateDan Finlay2017-04-251-0/+1
| | * | | | | Add placeholder etherscan token iconsDan Finlay2017-04-253-3/+35
| | * | | | | Get token list looking okDan Finlay2017-04-225-12/+136
| | * | | | | Add token-list dev stateDan Finlay2017-04-221-0/+93
| | * | | | | Add functional but ugly and hard-coded token listDan Finlay2017-04-217-15/+119
* | | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-225-16/+7
|\| | | | | |
| * | | | | | Merge pull request #1655 from MetaMask/fix-malitoThomas Huang2017-06-221-5/+1
| |\ \ \ \ \ \
| | * | | | | | Fix broken malito link.Kevin Serrano2017-06-221-5/+1
| * | | | | | | Merge pull request #1646 from MetaMask/ScarierSeedWordingFrankie2017-06-222-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Bump changelogDan Finlay2017-06-211-0/+1
| | * | | | | | Make seed confirmation wording scarierDan Finlay2017-06-211-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #1644 from MetaMask/i1630-badgefixFrankie2017-06-212-1/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Bump changelog.Kevin Serrano2017-06-211-0/+1
| | * | | | | Fix badge number to include personal_signKevin Serrano2017-06-211-1/+3
| |/ / / / /
| * | | | | Merge pull request #1624 from MetaMask/TestLintingKevin Serrano2017-06-201-9/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove second linting script for testsThomas Huang2017-06-181-9/+0
* | | | | | 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
|\| | | | |
| * | | | | Merge pull request #1607 from MetaMask/i1567-FixInaccurateErrorFrankie2017-06-174-20/+20
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-172-4/+3
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1623 from MetaMask/checkTxsFrankie2017-06-172-4/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
| | * | | | | bump provider enginefrankiebee2017-06-171-1/+1
| | | * | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
| | | * | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-172-1/+20
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #1622 from MetaMask/i1621-DebounceBackgroundUpdatesThomas Huang2017-06-161-1/+5
| |\ \ \ \ \ \
| | * | | | | | Debounce background updatesDan Finlay2017-06-161-1/+5
| |/ / / / / /
| * | | | | | Merge pull request #1619 from MetaMask/privacy-patchFrankie2017-06-161-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Do not recommend posting logs publicly on github.Dan Finlay2017-06-161-2/+0
| |/ / / / /
| * | | | | Merge pull request #1609 from MetaMask/issue-templateFrankie2017-06-161-0/+17
| |\ \ \ \ \
| | * | | | | Add issue template.Kevin Serrano2017-06-151-0/+17
| | | |_|_|/ | | |/| | |
| | | * | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-163-18/+54
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-162-0/+47
| |\ \ \ \ \
| | * | | | | transactions controller - add commentskumavis2017-06-161-0/+5
| | * | | | | add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-152-0/+42
| | |/ / / /
| * | | | | Merge pull request #1610 from MetaMask/bumpProviderkumavis2017-06-162-16/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | check for the tx in the block that provider engine gives usfrankiebee2017-06-152-16/+6
| | * | | | Bump provider-enginefrankiebee2017-06-151-1/+1
| |/ / / /
| | * | | check nonce and balance when resubmiting txfrankiebee2017-06-163-11/+18
| | * | | remove unnecessary logfrankiebee2017-06-151-4/+1
| | * | | bump eth-query for quiter logsfrankiebee2017-06-151-1/+1
| | * | | Do not mark slowly mined txs as failed.Dan Finlay2017-06-152-8/+5
| |/ / /
* | | | 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 #1606 from MetaMask/ubuntu-warningThomas Huang2017-06-152-0/+5
|\ \ \
| * | | Bump changelog.Kevin Serrano2017-06-151-0/+2
| * | | Add a new warning for file import JSONKevin Serrano2017-06-151-0/+3
|/ / /
* | | Merge pull request #1600 from MetaMask/i1554-ensSymFixKevin Serrano2017-06-142-15/+8
|\ \ \
| * | | Cleanup zero addresses.Kevin Serrano2017-06-141-5/+6
| * | | Bump changelog.Kevin Serrano2017-06-131-0/+1
| * | | Fix check icon appearing in inappropriate situations.Kevin Serrano2017-06-131-13/+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
| |/ / /
* | | | Merge pull request #1601 from MetaMask/ChainIdErrorTestFrankie2017-06-132-3/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Finish async when failing async testThomas Huang2017-06-131-1/+1
| * | | Fix networkState in chain idThomas Huang2017-06-131-1/+1
| * | | Make test AsyncThomas Huang2017-06-131-1/+2
|/ / /
* | | Merge pull request #1597 from MetaMask/Version-3.7.8kumavis2017-06-132-1/+3
|\ \ \
| * | | Version 3.7.8v3.7.8Dan Finlay2017-06-132-1/+3
|/ / /
* | | Merge pull request #1592 from MetaMask/qrPrefixkumavis2017-06-132-6/+7
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into qrPrefixFrankie2017-06-1314-7390/+47
| |\ \ | |/ / |/| |
* | | Merge pull request #1594 from MetaMask/prov-eng-bumpFrankie2017-06-131-1/+1
|\ \ \
| * | | deps - prov-eng 12.2.4kumavis2017-06-131-1/+1
* | | | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-132-2/+6
|\ \ \ \
| * | | | default testnet - fix typokumavis2017-06-131-1/+0
| * | | | Merge branch 'master' into i#1203MainNetSwitchkumavis2017-06-13206-9535/+12275
| |\| | |
| * | | | Merge branch 'master' into i#1203MainNetSwitchFrankie2017-03-1710-6/+211
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1203MainNetSwitchkumavis2017-03-1531-43/+40
| |\ \ \ \ \
| * | | | | | Add to CHANGELOGfrankiebee2017-03-141-0/+1
| * | | | | | Swithch the default network to mainnetfrankiebee2017-03-141-3/+6
* | | | | | | Merge pull request #1591 from MetaMask/ignore-package-lockFrankie2017-06-132-7356/+14
|\ \ \ \ \ \ \
| * | | | | | | gitignore - remove cached package-lockkumavis2017-06-131-7348/+0
| * | | | | | | gitignore - add package-lock and re-arrange by categorykumavis2017-06-131-8/+14
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1585 from MetaMask/t-lintFrankie2017-06-139-31/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | LintingThomas Huang2017-06-139-31/+26
|/ / / / / /
| | | | * | add to CHANGELOGfrankiebee2017-06-131-0/+1
| | | | * | only prefix ethereum addressfrankiebee2017-06-131-5/+6
| | | | * | prefix the address with "ethereum:"frankiebee2017-06-131-2/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1574 from MetaMask/internfixDan Finlay2017-06-133-3/+3
|\ \ \ \ \
| * | | | | Modify wording to new accept.Kevin Serrano2017-06-103-3/+3
| * | | | | Merge branch 'master' of github.com:nihar97/metamask-plugin into internfixKevin Serrano2017-06-093-3/+3
| |\ \ \ \ \
| | * | | | | continue button changed to agreeNihar2017-05-173-3/+3
* | | | | | | Merge pull request #1572 from MetaMask/mascaraUpkeepkumavis2017-06-134-11/+9
|\ \ \ \ \ \ \
| * | | | | | | reload page if ui is not presentfrankiebee2017-06-091-2/+6
generated by cgit (git 2.34.1) at 2024-10-17 04:44:23 +0800