aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Proper caching of node_modulesBruno Barbieri2018-07-061-22/+18
* Merge pull request #4738 from MetaMask/bmd/contrib-guidelinesDan Finlay2018-07-061-18/+13
|\
| * update contributing.mdBobby Dresser2018-07-061-18/+13
|/
* Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-065-155/+187
|\
| * Delete old restore vault file.Dan2018-07-063-341/+163
| * Update import from seed screen on new ui.Dan2018-07-055-4/+214
* | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-uiDan J Miller2018-07-0618-17/+320
|\ \
| * | Improve send token error ux.Dan2018-07-0518-17/+320
* | | Merge pull request #4733 from whymarrh/fix-setstate-warningsWhymarrh Whitby2018-07-063-0/+14
|\ \ \
| * | | Don't update token balances after tracker is stoppedWhymarrh Whitby2018-07-053-0/+10
| * | | Remove TokenTracker listeners when unmounting componentWhymarrh Whitby2018-07-052-0/+4
* | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warningWhymarrh Whitby2018-07-061-0/+9
|\ \ \ \
| * | | | Prevent calling setState in TxListItem after unmountWhymarrh Whitby2018-07-051-0/+9
| |/ / /
* | | | Merge pull request #4617 from TrejGun/fix-new-lineDan J Miller2018-07-061-0/+1
|\ \ \ \
| * | | | fix white spaces in signaturetrejgun2018-06-201-0/+1
* | | | | Merge pull request #4735 from whymarrh/restore-vault-focusDan J Miller2018-07-061-3/+0
|\ \ \ \ \
| * | | | | Don't persist the seed phrase in the old UI restore flowWhymarrh Whitby2018-07-051-3/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-styleDan J Miller2018-07-051-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensures token list amount is in its own row.Dan2018-07-051-0/+1
| | |/ / | |/| |
* | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-053-26/+22
|\ \ \ \
| * | | | Improve error and promise resolution handling in action.js updateGasData().Dan2018-07-051-13/+14
| * | | | Update new-ui-send integration tests to always explicitly set gas price. (e2e...Dan2018-07-051-12/+1
| * | | | Remove unnecessary anonymous function call in actions.js gas estimation.Dan2018-07-041-7/+6
| * | | | Use background gas price estimation method in new ui.Dan2018-06-292-8/+15
* | | | | Merge pull request #4721 from MetaMask/i4666-gasLimitDan J Miller2018-07-052-12/+5
|\ \ \ \ \
| * | | | | fixes 4666Sara Reynolds2018-07-041-2/+5
| * | | | | :qwSara Reynolds2018-07-041-10/+0
* | | | | | Merge pull request #4405 from PortalNetwork/portal-metamaskDan Finlay2018-07-0521-7/+473
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge pull request #4 from brunobar79/portal-metamask-lint-fixPhyrexTsai2018-07-04352-34570/+42735
| |\ \ \ \ \
| | * | | | | fix lint errorsbrunobar792018-07-045-25/+81
| | * | | | | Merge remote-tracking branch 'upstream/develop' into HEADbrunobar792018-07-04349-34563/+42672
| |/| | | | |
| * | | | | | Update to support pathnames on IPFS hashPhyrexTsai2018-06-291-4/+8
| * | | | | | Update 404.htmlPhyrexTsai2018-06-021-1/+2
| * | | | | | Merge branch 'develop' into portal-metamaskPhyrexTsai2018-06-0170-393/+2060
| |\ \ \ \ \ \
| * | | | | | | Update 404Yung chieh Tsai2018-06-011-1/+0
| * | | | | | | Update ipfs to infuraYung chieh Tsai2018-06-011-2/+2
| * | | | | | | Update manifest.jsonYung chieh Tsai2018-06-011-4/+3
| * | | | | | | Update appYung chieh Tsai2018-05-301-7/+0
| * | | | | | | Update default providerYung chieh Tsai2018-05-301-1/+1
| * | | | | | | Update libYung chieh Tsai2018-05-293-23/+71
| * | | | | | | Rename filesYung chieh Tsai2018-05-2910-1912/+119
| * | | | | | | Update manifest.jsonYung chieh Tsai2018-05-291-4/+0
| * | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-292-1/+5
| * | | | | | | setTimeout bug fixMikeCheng12082018-05-291-2/+5
| * | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-2921-6/+2157
* | | | | | | | Merge pull request #4719 from MetaMask/kumavis-patch-3kumavis2018-07-041-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update .eslintignorekumavis2018-07-041-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerabilityBruno Barbieri2018-07-042-14/+9
|\ \ \ \ \ \ \
| * | | | | | | ignore lodash vulnerabilitybrunobar792018-07-042-14/+9
* | | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | fixes 4663Sara Reynolds2018-07-042-0/+2
| |/ / / / / /
* | | | | | | Merge pull request #4717 from MetaMask/chrome-promise-bugfixDan Finlay2018-07-041-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Conditionally use Promise-based extension API when creating windowsbitpshr2018-07-041-4/+4
| |/ / / / /
* | | | | | Merge pull request #4654 from TrejGun/bignumberDan J Miller2018-07-042-1/+23
|\ \ \ \ \ \
| * | | | | | linttrejgun2018-06-291-1/+1
| * | | | | | change numberstrejgun2018-06-241-7/+6
| * | | | | | remove .onlytrejgun2018-06-241-1/+1
| * | | | | | fixes #4307 BigNumber casting issuetrejgun2018-06-242-1/+24
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errorsAlexander Tseung2018-07-042-2/+2
|\ \ \ \ \ \
| * | | | | | Check that error is defined in import-account error catch.Dan2018-06-292-2/+2
| * | | | | | Show all errors on account creation screen.Dan2018-06-292-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroesDan J Miller2018-07-043-4/+36
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | move removeLeadingZeroes to utils, add testtrejgun2018-07-023-4/+36
* | | | | | Merge pull request #4712 from MetaMask/lint-fixkumavis2018-07-04125-738/+689
|\ \ \ \ \ \
| * | | | | | fix contract-testbrunobar792018-07-031-3/+7
| * | | | | | fix unit testsbrunobar792018-07-031-4/+3
| * | | | | | fix testsbrunobar792018-07-032-6/+12
| * | | | | | fix warning for new-ui screen testsbrunobar792018-07-031-4/+2
| * | | | | | fix warning for unit testsbrunobar792018-07-0314-68/+35
| * | | | | | fix test/mascara.conf.js warningsbrunobar792018-07-031-1/+1
| * | | | | | fix warnings for integration testsbrunobar792018-07-033-7/+1
| * | | | | | fix warnings for e2e testsbrunobar792018-07-033-10/+8
| * | | | | | fix notices warningbrunobar792018-07-031-4/+5
| * | | | | | add QUnit to eslint globalsbrunobar792018-07-031-1/+2
| * | | | | | fix gentests.jsbrunobar792018-07-031-2/+3
| * | | | | | fix mascara warningsbrunobar792018-07-033-7/+6
| * | | | | | fix mascara/example/server.js warningsbrunobar792018-07-031-2/+2
| * | | | | | fix gentests.js warningsbrunobar792018-07-031-63/+69
| * | | | | | fix version-bump.jsbrunobar792018-07-031-4/+0
| * | | | | | fix verify-locale-strings.jsbrunobar792018-07-031-3/+4
| * | | | | | fix ui-dev.js warningsbrunobar792018-07-031-1/+0
| * | | | | | fix sourcemap-validator.js warningsbrunobar792018-07-031-4/+7
| * | | | | | fix mock-dev.js warningsbrunobar792018-07-031-2/+0
| * | | | | | fix beefy.js warningsbrunobar792018-07-031-3/+0
| * | | | | | add $ to globalsbrunobar792018-07-031-1/+2
| * | | | | | eslint --fix .brunobar792018-07-03116-533/+530
| * | | | | | remove gulp eslint and cleanup gulpfilebrunobar792018-07-032-32/+2
| * | | | | | update eslint rules and pathsbrunobar792018-07-032-1/+16
* | | | | | | Merge pull request #4709 from MetaMask/pointMasterContractMetadataEsteban Miño2018-07-032-4/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | point eth-contract-metadata to repo masterEsteban MIno2018-07-032-4/+3
|/ / / / / /
* | | | | | npm 6 fresh lock + node 8 (#4675)Bruno Barbieri2018-07-034-32479/+32280
* | | | | | Merge pull request #4692 from MetaMask/improve-e2e-beta-test-startupWhymarrh Whitby2018-07-021-5/+11
|\ \ \ \ \ \
| * | | | | | Improve checks for closing info page on app installation in e2e beta tests.Dan2018-06-291-5/+11
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
|\ \ \ \ \ \
| * | | | | | fixes #4623Sara Reynolds2018-06-308-24/+9
| |/ / / / /
* | | | | | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-302-1/+8
|\ \ \ \ \ \
| * | | | | | Fixed lint errorKoh Wei Jie2018-06-281-1/+1
| * | | | | | removed stray console.logKoh Wei Jie2018-06-221-1/+0
| * | | | | | fixed blank boolean field for typed signing for old UIKoh Wei Jie2018-06-221-1/+5
| * | | | | | fixed blank boolean field for typed signing for new UIKoh Wei Jie2018-06-221-0/+4
* | | | | | | Merge pull request #4647 from MetaMask/fix-overflow-currency-displayDan J Miller2018-06-303-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Improve attribute syntax in send-amount-row.component.jsDan J Miller2018-06-301-1/+1
| * | | | | | | Remove input arrows for send screen amount row on firefox.Dan2018-06-293-0/+11
| * | | | | | | Fix issues with scrollbar in currency display.Dan2018-06-292-2/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Set based estimate for token sends to be updated once recipient address speci...Dan2018-06-293-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-292-7/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix style of shapeshift screen in deposit modal.Dan2018-06-222-7/+26
| |/ / / / /
* | | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-2910-6749/+7671
|\ \ \ \ \ \
| * | | | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests)Dan2018-06-283-21/+543
| * | | | | | Turn off failing e2e beta assertion in firefox until bugs in webdriver/geckod...Dan2018-06-281-2/+6
| * | | | | | Update condition for backspace in customize gas step of token factory send te...Dan2018-06-281-1/+4
| * | | | | | Update package-lock.jsonDan2018-06-281-6526/+6601
| * | | | | | Fix add existing token test (e2e beta tests).Dan2018-06-271-3/+1
| * | | | | | Switch to eth and back before asserting on token balance (e2e beta token tests).Dan2018-06-271-1/+2
| * | | | | | await all clicks in e2e beta tests.Dan2018-06-271-9/+11
| * | | | | | Close popup window for e2e beta token factory send test.Dan2018-06-271-2/+3
| * | | | | | Fix retype seed phrase button.Dan2018-06-271-35/+46
| * | | | | | Disable e2e beta assertion after first token addition because of firefox / we...Dan2018-06-271-1/+8
| * | | | | | Pass correct params to verboseReportOnFailure in beta e2e tests.Dan2018-06-271-1/+1
| * | | | | | Add timeouts to certain beta e2e driver.waits.Dan2018-06-271-2/+2
| * | | | | | Add try catch to deal with false negative timeouts in beta e2e tests.Dan2018-06-271-7/+22
| * | | | | | Wait for element text match in metamask-beta-ui e2e send token testDan2018-06-271-4/+2
| * | | | | | Use locally served dapp to test contract calls in e2e beta testsDan2018-06-276-174/+131
| * | | | | | Add extra delay to e2e tests after remix page load.Dan2018-06-271-0/+1
| * | | | | | Fix send token tests in beta ui e2e tests.Dan2018-06-272-9/+26
| * | | | | | Speed up page opening and fix timeout errors on remix page opening in beta e2...Dan2018-06-272-13/+26
| * | | | | | Add delay before regularly failing test.Dan2018-06-271-0/+1
| * | | | | | Fix element located bug in beta e2e contract method call test.Dan2018-06-271-1/+1
| * | | | | | Improve wait for buy modal render after first time flow in beta e2e tests.Dan2018-06-271-1/+2
| * | | | | | Only show the customize gas modal if the estimateGas call is not currently in...Dan2018-06-274-6/+79
| * | | | | | Update metamask-beta-ui e2e spec to fail on insufficient gas estimation.Dan2018-06-271-7/+31
| * | | | | | Wait for locating of submit buttons before attempting to click in metamask.sp...Dan2018-06-271-3/+8
| * | | | | | Update tests to accomodate token list menu additions.Dan2018-06-271-1/+2
| * | | | | | Disable onbeforeunload alert on remix for contract integration tests.Dan2018-06-271-0/+1
| * | | | | | Adds test for hiding tokens.Dan2018-06-271-0/+19
| * | | | | | e2e beta tests for contract deployment and calling a contract method.Dan2018-06-272-2/+135
| * | | | | | Improve reliability of beta e2e tests by using webdriver apis to wait for cer...Dan2018-06-272-5/+12
| * | | | | | Add test for importing from private key to from-import-beta-ui.spec.js, and r...Dan2018-06-272-125/+19
| * | | | | | metamask-beta-ui.spec.js tests custom token send before searched token.Dan2018-06-271-38/+43
| * | | | | | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| * | | | | | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-0/+44
| * | | | | | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| * | | | | | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-2/+48
* | | | | | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove .only on testtmashuang2018-06-271-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-284-6/+79
|\ \ \ \ \ \ \
| * | | | | | | Only show the customize gas modal if the estimateGas call is not currently in...Dan2018-06-194-6/+79
* | | | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-287-41/+74
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| * | | | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2056-6786/+7086
| |\ \ \ \ \ \ \
| * | | | | | | | ENS input in send form shows distinct errors for invalid addresses and non-ex...Dan2018-06-157-22/+46
| * | | | | | | | ENS name revalidates on network change.Dan2018-06-131-23/+33
* | | | | | | | | Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix default importtrejgun2018-06-232-2/+2
| * | | | | | | | | linttrejgun2018-06-212-3/+13
| * | | | | | | | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4649 from hermanjunge/developThomas Huang2018-06-231-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | LicenseHerman Junge2018-06-231-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553Thomas Huang2018-06-211-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | set the popup id returned by create promisevittominacori2018-06-181-3/+4
| * | | | | | | | set an id to the metamask notification popupvittominacori2018-06-171-1/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #4575 from whymarrh/token-amount-overflowWhymarrh Whitby2018-06-218-16/+35
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Accept whitespace when matching token balances in e2e testsWhymarrh Whitby2018-06-212-7/+8
| * | | | | | | Add explicit timeout for add token testWhymarrh Whitby2018-06-211-1/+1
| * | | | | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
| * | | | | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
|/ / / / / / /
* | | | | | | Merge pull request #4612 from MetaMask/changelog-4.8.0-fixThomas Huang2018-06-201-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | changelog - remove incorrect entrykumavis2018-06-201-1/+0
|/ / / / / /
* | | | | | Merge pull request #4605 from MetaMask/masterThomas Huang2018-06-192-7/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4603 from MetaMask/v4.8.0kumavis2018-06-19222-8310/+15077
| |\ \ \ \ \
| | * | | | | Update ChangelogThomas2018-06-191-6/+1
| | * | | | | Merge branch 'develop' into v4.8.0Thomas2018-06-1923-62/+283
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #4602 from MetaMask/notice-controller-fixv4.8.0Thomas Huang2018-06-191-3/+6
|\ \ \ \ \ \ \
| * | | | | | | notice controller - properly show new notices for non-new userskumavis2018-06-191-3/+6
* | | | | | | | Merge pull request #4582 from MetaMask/fixEmailLinkkumavis2018-06-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix email link in phishing noticeThomas2018-06-151-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1912-21/+142
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update integration tests for newui gas estimation fixes.Dan2018-06-191-2/+2
| * | | | | | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| * | | | | | | Send screen returns simple gas cost if no to address specified when not sendi...Dan2018-06-192-3/+8
| * | | | | | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| * | | | | | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| * | | | | | | Revert to updating amount on blur of input change; update gas on blur of amou...Dan2018-06-192-5/+11
| * | | | | | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| * | | | | | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| * | | | | | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| * | | | | | | Add a buffer to new ui gas estimatesDan2018-06-152-2/+52
| * | | | | | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #4586 from MetaMask/block-idex-phisherkumavis2018-06-193-15/+18
|\ \ \ \ \ \ \
| * | | | | | | lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
| * | | | | | | blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
| * | | | | | | Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
| * | | | | | | Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
| |/ / / / / /
* | | | | | | View address of an added token (#4591)Csaba S2018-06-193-22/+43
* | | | | | | Merge pull request #4585 from MetaMask/ReenableDappReloadDan Finlay2018-06-173-1/+67
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Re-enable dapp reload on network changeDan Finlay2018-06-153-1/+67
|/ / / / / /
| | * / / / v4.8.0Thomas2018-06-152-8/+10
| |/ / / / |/| | | |
* | | | | Merge pull request #4524 from MetaMask/save-braveThomas Huang2018-06-152-3/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into save-bravekumavis2018-06-1539-6789/+6857
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #4571 from MetaMask/disable-diagnosticsDan Finlay2018-06-151-8/+0
|\ \ \ \ \ \
| * | | | | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
* | | | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-1523-183/+140
|\ \ \ \ \ \ \
| * | | | | | | test - e2e-beta - from import - handle phishing warningkumavis2018-06-141-8/+21
| * | | | | | | test - e2e-beta - separate notice tests into individual testskumavis2018-06-141-1/+5
| * | | | | | | test - e2e - clear phishing warningkumavis2018-06-142-1/+7
| * | | | | | | notice-controller - update memStore on bootkumavis2018-06-141-0/+1
| * | | | | | | test - e2e - check for phishing warningkumavis2018-06-144-15/+29
| * | | | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-1412-97/+39
| * | | | | | | notices - notices collection is now manually editedkumavis2018-06-147-65/+35
| * | | | | | | Add changelog item.Kevin Serrano2018-06-141-0/+1
| * | | | | | | Add phishing notice.Kevin Serrano2018-06-143-2/+8
| |/ / / / / /
* | | | | | | Merge pull request #4513 from MetaMask/ValidateEmptyKeykumavis2018-06-145-18/+77
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-14204-1737/+8267
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4570 from MetaMask/persistence-stream-fixkumavis2018-06-143-6/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | changelog - add note on persistence bugkumavis2018-06-141-0/+1
| * | | | | | | | background - persistence pipeline - fix persistence bugkumavis2018-06-142-6/+32
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4550 from MetaMask/bmd/sign-warning-helplinkbobby dresser2018-06-142-1/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fixKevin Serrano2018-06-141-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into nonce-tracker-mutex-fixkumavis2018-06-135-6532/+6544
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4558 from MetaMask/stop-reload-on-network-changeDan Finlay2018-06-133-65/+20
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into stop-reload-on-network-changeErik Marks2018-06-13172-7992/+14314
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fixkumavis2018-06-134-40/+47
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #4556 from MetaMask/WatchTestReloadDan Finlay2018-06-132-6468/+6525
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add script for auto-re-running tests on changeDan Finlay2018-06-132-6468/+6525
|/ / / / / / / / / /
| | * | | | | | | | update changelogErik Marks2018-06-131-0/+3
| | * | | | | | | | undo package.json and package-lock.json changesErik Marks2018-06-132-6817/+6539
| | * | | | | | | | removed auto-reload.js, moved global web3 export to inpage.jsErik Marks2018-06-132-43/+16
| | * | | | | | | | wipErik Marks2018-06-134-6580/+6839
| | | * | | | | | | changelog - add note on nonce-lock mutex fixkumavis2018-06-131-0/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
| * | | | | | | | metamask - ensure all nonce locks are releasedkumavis2018-06-134-17/+18
| * | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
|/ / / / / / / /
* | | | | | | | Merge pull request #4554 from whymarrh/fix-e2e-profile-pathWhymarrh Whitby2018-06-131-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix e2e test Chrome profile pathsWhymarrh Whitby2018-06-131-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screenDan J Miller2018-06-112-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
|/ / / / / / /
| | * | | | | account-import-strategies - ensure privateKey is prefixed before converting t...kumavis2018-06-141-2/+3
| | * | | | | test - unit - add assertRejects to test asyncFnskumavis2018-06-142-5/+23
| | * | | | | test - unit - import strategies - properly await async methodskumavis2018-06-141-8/+8
| | * | | | | Make account import tests much more specificDan Finlay2018-06-123-6467/+6530
| | * | | | | Improve private key import testsDan Finlay2018-06-081-1/+25
| | * | | | | Improve test formattingDan Finlay2018-06-081-16/+19
| | * | | | | Bump changelogDan Finlay2018-06-061-0/+1
| | * | | | | Add validation for importing empty private keyDan Finlay2018-06-061-0/+3
| | | * | | | Handle brave throwsDan Finlay2018-06-151-3/+11
| | | * | | | changelog - version fixkumavis2018-06-091-2/+0
| | | * | | | changelog 4270Jenny Pollack2018-06-081-0/+3
| | | * | | | Merge branch 'develop' into save-braveJenny Pollack2018-06-08186-1530/+8026
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:05:58 +0800