aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modify conversion to new api.Kevin Serrano2017-09-152-58/+597
* Merge branch 'master' into new-currency-testKevin Serrano2017-09-1433-236/+483
|\
| * Merge pull request #2079 from MetaMask/FixSupportLinkKevin Serrano2017-09-132-1/+2
| |\
| | * Bump changelogDan Finlay2017-09-131-0/+1
| | * Fix support linkDan Finlay2017-09-131-1/+1
| |/
| * Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0kumavis2017-09-131-1/+1
| |\
| | * chore(package): update babel-eslint to version 8.0.0greenkeeper[bot]2017-09-121-1/+1
| * | Merge pull request #2074 from MetaMask/export-state-logskumavis2017-09-132-3/+5
| |\ \
| | * | Add to changelog.Kevin Serrano2017-09-131-0/+1
| | * | Convert state logs into a download.Kevin Serrano2017-09-131-3/+4
| * | | Merge pull request #2069 from MetaMask/integration-tests-fix2Thomas Huang2017-09-138-80/+172
| |\ \ \ | | |/ / | |/| |
| | * | ci - remove old testem configkumavis2017-09-121-9/+0
| | * | tests - integration - fix bad cherry-pickkumavis2017-09-121-16/+7
| | * | test - integration - drop testem for karmakumavis2017-09-125-56/+150
| | * | test - integration - remove redundant testem scriptskumavis2017-09-122-2/+0
| | * | test - integration - build - manually exit from test builder + add bundle des...kumavis2017-09-121-1/+2
| | * | ci - dont attempt to submit coveralls if not configuredkumavis2017-09-121-1/+1
| | * | test - integration - build - use pump + log bundling informationkumavis2017-09-121-6/+12
| | * | ci - deps - download latest chrome and firefoxkumavis2017-09-121-1/+12
| | |/
| * | Merge pull request #2072 from MetaMask/kumavis-patch-2Kevin Serrano2017-09-121-0/+0
| |\ \ | | |/ | |/|
| | * Rename add-to-firef.md to add-to-firefox.mdkumavis2017-09-121-0/+0
| |/
| * Merge pull request #2068 from MetaMask/export-as-fileDan Finlay2017-09-124-9/+48
| |\
| | * Fix typo.Kevin Serrano2017-09-121-2/+2
| | * Change the changelogKevin Serrano2017-09-121-0/+3
| | * Add ability to save seed words as file.Kevin Serrano2017-09-121-0/+10
| | * Add some styling.Kevin Serrano2017-09-121-0/+3
| | * Move function as util function.Kevin Serrano2017-09-122-16/+18
| | * Basic private key download file functionality.Kevin Serrano2017-09-121-9/+30
| * | Merge pull request #2067 from MetaMask/integration-tests-fixDan Finlay2017-09-121-94/+87
| |\ \ | | |/ | |/|
| | * test - integration - use async fn for error catchingkumavis2017-09-121-94/+87
| * | Merge pull request #2065 from MetaMask/Version-3.10.0Kevin Serrano2017-09-122-1/+4
| |\ \ | | |/ | |/|
| | * Version 3.10.0v3.10.0Dan Finlay2017-09-122-1/+4
| |/
| * Merge pull request #2045 from MetaMask/rejectallunapprovedDan Finlay2017-09-124-15/+43
| |\
| | * Show reject all only when tx count is > 1Kevin Serrano2017-09-122-2/+6
| | * Remove markdown from changelog.Kevin Serrano2017-09-121-1/+1
| | * Merge github.com:MetaMask/metamask-extension into rejectallunapprovedKevin Serrano2017-09-128-43/+90
| | |\ | | |/ | |/|
| * | Merge pull request #2051 from MetaMask/ci-speedupDan Finlay2017-09-121-4/+0
| |\ \
| | * | ci - dont need global install of test utilskumavis2017-09-081-4/+0
| * | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissionsKevin Serrano2017-09-112-3/+3
| |\ \ \
| | * | | Merge branch 'master' into i1938-removecryptopermissionskumavis2017-09-082-6/+27
| | |\| |
| | * | | Add to changelog.Kevin Serrano2017-09-081-0/+1
| | * | | Remove cryptonator from chrome permissions.Kevin Serrano2017-09-081-3/+2
| * | | | Merge pull request #2047 from MetaMask/i1997-networkindicateThomas Huang2017-09-091-3/+8
| |\ \ \ \
| | * | | | Add cursor on hover on loading. Change some wording.Kevin Serrano2017-09-081-3/+3
| | * | | | Add caret to indicate network is dropdown.Kevin Serrano2017-09-081-0/+5
| * | | | | Merge pull request #2057 from MetaMask/Version-3.9.13kumavis2017-09-093-26/+32
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Version 3.9.13v3.9.13Dan Finlay2017-09-092-1/+5
| | * | | | inpage provider - define sendAsync on the prototypekumavis2017-09-091-25/+27
| * | | | | Merge pull request #2048 from MetaMask/i1984-tokenvalidationsDan Finlay2017-09-082-6/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix typo.Kevin Serrano2017-09-081-1/+1
| | * | | | Fix link to open new tab.Kevin Serrano2017-09-081-0/+1
| | * | | | Bump changelog.Kevin Serrano2017-09-081-0/+2
| | * | | | Add front-end validation for own adddresses as a token contract address. Add ...Kevin Serrano2017-09-081-6/+24
| |/ / / /
| * | | | Merge pull request #2046 from MetaMask/RewordSeedRestoreKevin Serrano2017-09-081-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Reword forgot password to restore seed phraseDan Finlay2017-09-081-1/+1
| |/ / /
| * | | Merge pull request #1987 from MetaMask/CheckFaq67Kevin Serrano2017-09-081-0/+19
| |\ \ \
| | * | | Add test for trying to reproduce faq#67Dan Finlay2017-08-301-0/+19
| | | | * Changelog and attribution.Kevin Serrano2017-09-081-0/+1
| | | | * Convert icon to button.Kevin Serrano2017-09-082-12/+18
| | | | * Fold submit and buy ether into one button slotKevin Serrano2017-09-081-15/+9
| | | | * Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal...Kevin Serrano2017-09-082-0/+23
| | |_|/| | |/| | |
| | | | * fix goHomedavidp942017-08-151-2/+6
| | | | * remove unused action typedavidp942017-08-151-1/+0
| | | | * cancel all txsDavidNinja2017-08-152-0/+20
| * | | | Merge pull request #1893 from MetaMask/readd-looseThomas Huang2017-09-086-5/+30
| |\ \ \ \
| | * | | | Place object property retrieval inside try-catchKevin Serrano2017-09-081-2/+3
| | * | | | Change expected type to array.Kevin Serrano2017-09-081-1/+1
| | * | | | Changelog bumpKevin Serrano2017-09-071-0/+1
| | * | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-075-7/+11
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #2033 from MetaMask/Version-3.9.12kumavis2017-09-072-1/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Version 3.9.12v3.9.12Dan Finlay2017-09-072-1/+4
| |/ / / /
| * | | | Merge pull request #2017 from MetaMask/DevEnviornmentkumavis2017-09-072-4/+4
| |\ \ \ \
| | * | | | Update mock-store dependencytmashuang2017-09-071-2/+2
| | * | | | Update development storetmashuang2017-09-051-2/+2
| * | | | | Merge pull request #2023 from MetaMask/web3-1.0-fixDan Finlay2017-09-071-2/+3
| |\ \ \ \ \
| | * | | | | inpage - bug fixkumavis2017-09-061-2/+3
| |/ / / / /
| | | * | | Properly update keyring state on new account addition.Kevin Serrano2017-09-071-1/+2
| | | * | | Merge branch 'master' into readd-looseKevin Serrano2017-09-063-3/+16
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarningKevin Serrano2017-09-062-2/+14
| |\ \ \ \ \
| | * | | | | Make eth_sign deprecation warning more usefulDan Finlay2017-09-062-2/+14
| | |/ / / /
| * | | | | Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarningKevin Serrano2017-09-062-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make web3 deprecation notice more usefulDan Finlay2017-09-062-1/+2
| |/ / / /
| | * | | Resolve merge conflict from masterKevin Serrano2017-09-0632-270/+3791
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Readd loose label onto accounts.Kevin Serrano2017-08-104-4/+26
* | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-068-13/+20
|\| | | |
| * | | | Merge pull request #2008 from MetaMask/mascara-fixkumavis2017-09-022-4/+4
| |\ \ \ \
| | * | | | mascara - fix iframe stream constructorkumavis2017-09-022-4/+4
| * | | | | Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0Thomas Huang2017-09-021-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | chore(package): update sinon to version 3.2.0greenkeeper[bot]2017-08-101-1/+1
| * | | | | Merge pull request #2007 from MetaMask/i2005-HttpsLinjsKevin Serrano2017-09-023-6/+8
| |\ \ \ \ \
| | * | | | | Bump changelogDan Finlay2017-09-021-0/+2
| | * | | | | Update etherscan links to httpsDan Finlay2017-09-021-5/+5
| | * | | | | Update support linkDan Finlay2017-09-021-1/+1
| |/ / / / /
| * | | | | Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogsKevin Serrano2017-08-302-1/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i1986-AddVersionToStateLogsKevin Serrano2017-08-302-1/+2
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1992 from MetaMask/MultipleTokensTextKevin Serrano2017-08-302-1/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Update changelogThomas Huang2017-08-301-0/+1
| | * | | | | Multiple tokens shows the amount when greater than 1Thomas Huang2017-08-301-1/+1
| |/ / / / /
| | * / / / Add version to state logsDan Finlay2017-08-302-1/+5
| |/ / / /
* | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-08-304-22/+73
|\| | | |
| * | | | Merge pull request #1985 from MetaMask/i1974-EnsureDeepCloneHistorykumavis2017-08-291-0/+26
| |\ \ \ \
| | * | | | Add some tests to tx-state-history-helperDan Finlay2017-08-291-0/+26
| * | | | | Merge pull request #1965 from MetaMask/inpage-provider-fixesKevin Serrano2017-08-293-22/+47
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into inpage-provider-fixeskumavis2017-08-298-41/+189
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | inpage - add changelog notekumavis2017-08-291-0/+3
| | * | | | 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
* | | | | | integrate infura currencyKevin Serrano2017-08-304-7/+66
|/ / / / /
* | | | | Merge pull request #1977 from MetaMask/Version-3.9.11Dan Finlay2017-08-242-1/+3
|\ \ \ \ \
| * | | | | Version 3.9.11v3.9.11Dan Finlay2017-08-242-1/+3
|/ / / / /
* | | | | 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
* | | | | | Merge pull request #1971 from MetaMask/SetMaxRetryLimitkumavis2017-08-243-2/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump changelogDan Finlay2017-08-241-0/+1
| * | | | | Fail transactions after a day of retriesDan Finlay2017-08-242-2/+12
|/ / / / /
* | | | | Merge pull request #1969 from MetaMask/i1966-IgnoreInvalidPendingNoncesDan Finlay2017-08-243-38/+89
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump changelogDan Finlay2017-08-241-0/+2
| * | | | 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
| * | | | Corrected test constraintsDan Finlay2017-08-241-2/+2
| * | | | Add mysterious failing testDan Finlay2017-08-241-0/+20
| * | | | Pass nonce testsDan Finlay2017-08-242-12/+11
| * | | | Got all tests but one passingDan Finlay2017-08-241-0/+1
| * | | | Fix new test, break an older maybe wrong oneDan Finlay2017-08-242-29/+27
| * | | | LintedDan Finlay2017-08-241-1/+0
| * | | | Add failing test for newly identified error stateDan Finlay2017-08-241-0/+17
| * | | | Simplify nonce calculationDan Finlay2017-08-241-4/+5
|/ / / /
* | | | Merge pull request #1963 from MetaMask/Version-3.9.10v3.9.10Dan Finlay2017-08-242-1/+3
|\ \ \ \
| * | | | Version 3.9.10Dan Finlay2017-08-242-1/+3
|/ / / /
* | | | Merge pull request #1945 from MetaMask/useLocalNonceDan Finlay2017-08-245-58/+255
|\ \ \ \
| * \ \ \ Merge branch 'master' into useLocalNonceDan Finlay2017-08-242-10/+2
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1960 from MetaMask/RemoveTxVizKevin Serrano2017-08-242-10/+3
|\ \ \ \ \
| * | | | | Remove eth-tx-viz link from tx history iconsDan Finlay2017-08-242-10/+3
|/ / / / /
| * | | | Bump changelogDan Finlay2017-08-241-0/+2
| * | | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-2410-27/+3214
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1946 from MetaMask/Version-3.9.9Thomas Huang2017-08-192-2/+3
|\ \ \ \ \
| * | | | | Version 3.9.9v3.9.9Dan Finlay2017-08-192-2/+3
|/ / / / /
* | | | | Merge pull request #1914 from MetaMask/history-diffDan Finlay2017-08-198-26/+3211
|\ \ \ \ \
| * | | | | clean - remove unused test datakumavis2017-08-151-13634/+0
| * | | | | migration 18 - activatekumavis2017-08-151-0/+1
| * | | | | migration 18 - fix an oopskumavis2017-08-151-1/+1
| * | | | | tx controller - test - fix typo from moved testkumavis2017-08-151-3/+3
| * | | | | tx controller - tx state history various small fixeskumavis2017-08-155-4/+13637
| * | | | | tx controller - test - test tx state history in updateTxkumavis2017-08-151-6/+18
| * | | | | migration 18 - move to diff-based historykumavis2017-08-151-0/+52
| * | | | | introduce tx-state-history-helper and diff-based historykumavis2017-08-156-20/+3141
| | |_|_|/ | |/| | |
| | * | | Fix format of changelogDan Finlay2017-08-241-1/+0
| | * | | 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
| | * | | Refer to pending nonces, not just their countDan Finlay2017-08-221-0/+15
| | * | | clean up codefrankiebee2017-08-221-39/+43
| | * | | nonce-tracker - pass testsfrankiebee2017-08-221-11/+38
| | * | | fix testfrankiebee2017-08-221-9/+9
| | * | | When network nonce is highest, it should be used.Dan Finlay2017-08-221-4/+15
| | * | | Fix testDan Finlay2017-08-221-5/+5
| | * | | Add new assertions and de-duplicate nonce tracker generationDan Finlay2017-08-221-29/+73
| | * | | Add test for no previous txsDan Finlay2017-08-221-4/+25
| | * | | Confine mock strategy to describe blockDan Finlay2017-08-221-35/+39
| | * | | Move mock txs to tx mocking classDan Finlay2017-08-222-35/+48
| | * | | 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
| | * | | add test for using localNoncefrankiebee2017-08-191-4/+42
| |/ / / |/| | |
* | | | Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFixKevin Serrano2017-08-192-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1912-TokenPrecisionFixKevin Serrano2017-08-193-2/+8
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1942 from MetaMask/i1903-EthSignFormatThomas Huang2017-08-183-2/+7
|\ \ \ \ \
| * | | | | Bump changelogDan Finlay2017-08-181-0/+2
| * | | | | Fix eth sign formattingDan Finlay2017-08-182-2/+5
|/ / / / /
| * / / / Fix token balance precision renderingDan Finlay2017-08-182-1/+2
|/ / / /
* | | | Merge pull request #1935 from MetaMask/i1091-ShowTxErrorsFrankie2017-08-183-104/+8
|\ \ \ \
| * | | | Remove dead testsDan Finlay2017-08-171-86/+1
| * | | | Bump changelogDan Finlay2017-08-171-0/+2
| * | | | Transition to home view after tx errorDan Finlay2017-08-171-18/+5
* | | | | Merge pull request #1933 from MetaMask/Version-3.9.8Thomas Huang2017-08-172-1/+3
|\| | | |
| * | | | Version 3.9.8v3.9.8Dan Finlay2017-08-172-1/+3
|/ / / /
* | | | Merge pull request #1928 from MetaMask/RemoveDefaultTokensKevin Serrano2017-08-173-52/+31
|\ \ \ \
| * | | | Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
| * | | | Remove dead codeDan Finlay2017-08-171-14/+0
| * | | | Bump changelogDan Finlay2017-08-171-0/+3
| * | | | Remove default tokensDan Finlay2017-08-171-11/+1
| * | | | ReEnable Token ListDan Finlay2017-08-171-26/+9
|/ / / /
* | | | Merge pull request #1921 from MetaMask/v3.9.7Kevin Serrano2017-08-162-1/+3
|\ \ \ \
| * | | | v3.9.7 update changelogv3.9.7kumavis2017-08-161-0/+2
| * | | | v3.9.7kumavis2017-08-161-1/+1
* | | | | Merge pull request #1916 from MetaMask/fix/account-name-scrollKevin Serrano2017-08-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix overflow issue on QubesOS, flagged by @kumavissdtsui2017-08-151-1/+1
| |/ / /
* | | | Merge pull request #1918 from MetaMask/token-hotfixKevin Serrano2017-08-162-9/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Change cursor type to indicate link.Kevin Serrano2017-08-161-0/+1
| * | | fix spellingfrankiebee2017-08-161-4/+3
| * | | Add to CHANGELOGfrankiebee2017-08-161-0/+1
| * | | Disable token listfrankiebee2017-08-161-9/+26
|/ / /
* | | Merge pull request #1904 from MetaMask/web3-depreciationkumavis2017-08-132-1/+6
|\ \ \
| * | | fix wordingfrankiebee2017-08-121-1/+1
| * | | Add to CHANGELOGfrankiebee2017-08-121-0/+2
| * | | add deprecation warning for web3frankiebee2017-08-121-1/+4
| |/ /
* | | Merge pull request #1899 from sdtsui/fix/acct-name-lengthsFrankie2017-08-123-4/+22
|\ \ \ | |/ / |/| |
| * | Cleanup stray logs and lintsdtsui2017-08-112-6/+1
| * | Add overflow support for all account names in account detailssdtsui2017-08-111-2/+11
| * | Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
| * | Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
|/ /
* | Merge pull request #1894 from MetaMask/3.9.6v3.9.6Thomas Huang2017-08-102-3/+5
|\ \
| * | 3.9.6kumavis2017-08-102-3/+5
|/ /
* | Merge pull request #1892 from MetaMask/deps-queryThomas Huang2017-08-101-1/+1
|\ \ | |/ |/|
| * deps - bump ethjs-querykumavis2017-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
* | Merge pull request #1885 from MetaMask/dharmakumavis2017-08-102-46/+115
|\ \
| * | ui - buy eth - formatting and moved network names to configkumavis2017-08-102-23/+24
| * | lint fixkumavis2017-08-091-1/+1
| * | ui - buy eth - add dharma beta to kovankumavis2017-08-091-12/+22
| * | ui - buy button view - refactorkumavis2017-08-091-46/+104
| |/
* | Merge pull request #1884 from MetaMask/waffle-badgeFrankie2017-08-091-1/+2
|\ \ | |/ |/|
| * readme - add waffle.io badgekumavis2017-08-091-1/+2
|/
* Merge pull request #1882 from MetaMask/tx-cont-fixesFrankie2017-08-092-4/+12
|\
| * 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 pull request #1879 from MetaMask/build-err-fixThomas Huang2017-08-092-19/+28
|\ \
| * | build - factor watcify into bundler generationkumavis2017-08-091-17/+11
| * | build - fix error swallowing on devkumavis2017-08-091-1/+16
| * | deps - bump watchifykumavis2017-08-091-2/+2
|/ /
* | Merge pull request #1854 from MetaMask/greenkeeper/initialThomas Huang2017-08-099-46/+49
|\ \
| * \ Merge branch 'master' into greenkeeper/initialkumavis2017-08-0914-380/+680
| |\ \ | |/ / |/| |
* | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layoutkumavis2017-08-092-70/+80
|\ \ \ | |_|/ |/| |
| * | Fix layout issues flagged by @tmashuangsdtsui2017-08-091-69/+79
| * | Make buy ui more central to the screensdtsui2017-08-091-1/+1
* | | Merge pull request #1861 from MetaMask/transactionControllerRefractorkumavis2017-08-0912-310/+600
|\ \ \ | |/ / |/| |
| * | add json-rpc-engine && eth-json-rpc-middleware to devDependenciesfrankiebee2017-08-091-0/+2
| * | fix class namesfrankiebee2017-08-093-18/+25
| * | use provider stubfrankiebee2017-08-092-88/+65
| * | create a provider stubfrankiebee2017-08-091-0/+25
generated by cgit (git 2.34.1) at 2024-10-14 12:32:13 +0800