aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix display of unapprovedMessages in txList (old and new ui); includes fix ↵Dan2018-03-283-9/+21
| | | | of undefined txParams.
* Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0kumavis2018-03-281-1/+1
|\ | | | | Update eslint-plugin-mocha to the latest version 🚀
| * chore(package): update eslint-plugin-mocha to version 5.0.0greenkeeper[bot]2018-03-241-1/+1
| |
* | Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0kumavis2018-03-281-1/+1
|\ \ | | | | | | Update sinon to the latest version 🚀
| * | chore(package): update sinon to version 5.0.0greenkeeper[bot]2018-03-221-1/+1
| | |
* | | Merge pull request #3752 from MetaMask/sentry-error-fixFrankie2018-03-283-25/+35
|\ \ \ | | | | | | | | sentry - simplify all ethjs errors for better batching
| * | | sentry - simplify all ethjs errors for better batchingkumavis2018-03-283-25/+35
| | | |
* | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-282-34/+41
|\ \ \ \ | | | | | | | | | | Fix bug where resetAccount does not clear network cache
| * | | | metamask-controller - fix typokumavis2018-03-281-1/+1
| | | | |
| * | | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-282-34/+41
| | | | | | | | | | | | | | | | | | | | Fixes #3439
* | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammountskumavis2018-03-281-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Long token amounts in wallet are truncated with ellipsis.
| * | | | | Long token amounts in wallet are truncated with ellipsis.Dan2018-03-271-1/+8
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0xkumavis2018-03-281-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Prefixes to addresses with 0x before sending.
| * | | | | Prefixes to addresses with 0x before sending.Dan2018-03-271-1/+3
| | | | | |
* | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefinedkumavis2018-03-281-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prevent users from adding custom token if decimals is an empty string.
| * | | | | | Prevent users from adding custom token if decimals is an empty string.Dan2018-03-271-1/+4
| |/ / / / /
* | | | | | Merge pull request #3740 from danjm/i3682-navigateTo-undefinedkumavis2018-03-281-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Stop using navigateTo for external link in settings.
| * | | | | | Stop using navigateTo for external link in settings.Dan2018-03-271-5/+0
| |/ / / / /
* | | | | | Merge pull request #3743 from gasolin/buyetherviewkumavis2018-03-281-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unavailable goToBuyEtherView propType
| * | | | | | remove unavailable goToBuyEtherView propTypegasolin2018-03-271-2/+0
| |/ / / / /
* | | | | | Merge pull request #3609 from MetaMask/i18n-translator-reduxkumavis2018-03-28100-650/+1155
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle i18n with redux.
| * | | | | | i18n - fix locales indekumavis2018-03-281-1/+1
| | | | | | |
| * | | | | | ui - actions - fix log for background callkumavis2018-03-281-1/+1
| | | | | | |
| * | | | | | ui - settings - fix for currentLocalekumavis2018-03-281-2/+3
| | | | | | |
| * | | | | | ui - settings - derrive locales from indexkumavis2018-03-281-8/+1
| | | | | | |
| * | | | | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
| | | | | | |
| * | | | | | development - genStates - simplify locale importingkumavis2018-03-282-14/+2
| | | | | | |
| * | | | | | i18n - add locales index jsonkumavis2018-03-281-0/+19
| | | | | | |
| * | | | | | test - integration - add locale build stepkumavis2018-03-281-2/+4
| | | | | | |
| * | | | | | Merge branch 'i18n-translator-redux' of ↵kumavis2018-03-281-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i18n-translator-redux
| | * | | | | | Don't query for undefined.Dan2018-03-281-1/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-286-12/+194
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / i18n-translator-redux
* | | | | | | Merge pull request #3758 from MetaMask/i#3731kumavis2018-03-285-9/+154
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | I#3731
| * \ \ \ \ \ \ Merge branch 'master' into i#3731frankiebee2018-03-285-28/+118
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | migration for removing unnecessary transactions from statefrankiebee2018-03-284-3/+154
| | | | | | | |
| * | | | | | | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
| | | | | | | |
* | | | | | | | Merge pull request #3755 from MetaMask/revert-3730-revert-3665-ci-buildThomas Huang2018-03-281-3/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Restore "Ci - introduce a build job"
| * | | | | | | ci - end by flowing all required tests into a single jobkumavis2018-03-281-2/+2
| | | | | | | |
| * | | | | | | ci - end by flowing all required tests into a single jobkumavis2018-03-281-7/+8
| | | | | | | |
| * | | | | | | ci - end by flowing all required tests into a single jobkumavis2018-03-281-0/+16
| | | | | | | |
| * | | | | | | ci - run e2e tests after build stepkumavis2018-03-281-18/+21
| | | | | | | |
| * | | | | | | Revert "Revert "Ci - introduce a build job""kumavis2018-03-281-0/+17
|/ / / / / / /
| | | * | | | deps - update package-lockkumavis2018-03-281-3/+63
| | | | | | |
| | | * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-287-26/+448
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | i18n-translator-redux
* | | | | | | Merge pull request #3754 from MetaMask/selenium-e2eThomas Huang2018-03-285-1/+336
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | test - e2e testing with selenium
| * | | | | | deps - update package-lockkumavis2018-03-281-0/+6
| | | | | | |
| * | | | | | ci - run e2e jobskumavis2018-03-282-1/+18
| | | | | | |
| * | | | | | Merge branch 'master' into selenium-e2eThomas Huang2018-03-2859-429/+3417
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3739 from gasolin/zhtwfixv4.4.0kumavis2018-03-281-11/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [zh-TW] fix translation and add missing strings
| * | | | | | | [zh-TW] fix translation and add missing stringsgasolin2018-03-271-11/+50
| | | | | | | |
* | | | | | | | Merge pull request #3746 from nyatla/masterkumavis2018-03-281-14/+62
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Updated the Japanese expression and added some translations.
| * | | | | | | Update messages.jsonR.IIzuka2018-03-271-14/+62
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixed Japanese phrases. Add some translations.
| | * | | | | Merge branch 'master' into selenium-e2eThomas2018-03-222-8/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-22121-4075/+11734
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-1598-886/+2555
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-103-18/+154
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Update selenium testsThomas2018-03-101-9/+7
| | | | | | | | | | |
| | * | | | | | | | | Add selenium-webdriver and chromedriverThomas2018-03-101-0/+175
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-10428-4347/+70713
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | chromedriver, changed extension id(might need zip/crx file)Thomas2018-01-193-4/+6
| | | | | | | | | | | |
| | * | | | | | | | | | UpdateThomas2018-01-183-1/+144
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | E2E testing with seleniumtmashuang2017-09-133-1/+144
| | | | | | | | | | | | |
| | | | | | | | | | * | | Undo unnecessary line removals.Dan2018-03-272-0/+2
| | | | | | | | | | | | |
| | | | | | | | | | * | | Remove comments and console.logsDan2018-03-273-4/+3
| | | | | | | | | | | | |
| | | | | | | | | | * | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2721-140/+2922
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3737 from MetaMask/include-migration-22kumavis2018-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | include migration 22
| * | | | | | | | | | | | include migration 22frankiebee2018-03-271-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3735 from MetaMask/v4.4.0Dan Finlay2018-03-272-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | v4.4.0
| * | | | | | | | | | | | changelog - add note ofr i18n zh_tw th slkumavis2018-03-271-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | v4.4.0kumavis2018-03-272-1/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3732 from MetaMask/i3706-FixLocalStoreWriteDan Finlay2018-03-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Fix bug where full localStorage would crash on start
| * | | | | | | | | | | Fix bug where full localStorage would crash on startDan Finlay2018-03-272-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-274-14/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Popup uses new ui onboarding when in beta.
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fix tests.Dan2018-03-272-4/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Improve responsivensss of unique image screen.Dan2018-03-241-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Pop uses new ui onboarding when in beta.Dan2018-03-233-10/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-276-122/+321
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Updates Add token screen to latest design.
| * | | | | | | | | | | | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-2738-218/+354
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update add token integration tests.Dan2018-03-261-9/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use new header on add token confirmation screen.Dan2018-03-261-65/+68
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Updates Add token screen to latest design.Dan2018-03-244-99/+256
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3728 from MetaMask/changle-updates-march26Thomas Huang2018-03-271-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | New-ui changelog updates (March 26)
| * | | | | | | | | | | | | New-ui changelog updates (March 26)Dan2018-03-271-0/+6
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3729 from MetaMask/test-timeout-fixThomas Huang2018-03-271-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | test - remove timeout causing mocha disconnect issues
| * | | | | | | | | | | | | test - remove timeout causing mocha disconnect issueskumavis2018-03-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "test - flat - add extra timeout" This reverts commit 4c2cf15d2ad9cdfee4ce67b795877c7ab60231a7.
* | | | | | | | | | | | | | Merge pull request #3730 from MetaMask/revert-3665-ci-buildDan Finlay2018-03-271-17/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Ci - introduce a build job"
| * | | | | | | | | | | | | | Revert "Ci - introduce a build job"Dan Finlay2018-03-271-17/+0
|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-272-0/+71
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * test for migration 022 * write migration 022 adding submittedTime to txMetas whove been submitted
* | | | | | | | | | | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflowThomas Huang2018-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed type data notification handles long messages.
| * | | | | | | | | | | | | Signed type data notification handles long messages.Dan2018-03-231-0/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3665 from MetaMask/ci-buildDan Finlay2018-03-271-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci - introduce a build job
| * | | | | | | | | | | | | ci - fix build job loggingkumavis2018-03-221-2/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | ci - add build stepkumavis2018-03-221-0/+14
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | i18n - sl Slovenian translation (#3724)Filip Š2018-03-271-0/+819
| | | | | | | | | | | | |
* | | | | | | | | | | | | i18n - zh_tw traditional chinese (taiwanese)gasolin2018-03-271-0/+864
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * translate to Traditional Chinese, fix #3529
* | | | | | | | | | | | | Merge pull request #3711 from artiya4u/feature/thai_localekumavis2018-03-271-0/+819
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Add Translate to Thai #3543
| * | | | | | | | | | | | Update Thai translate.artiya4u2018-03-241-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update Thai translate.artiya4u2018-03-241-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update Thai translate.artiya4u2018-03-241-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | ๊๊Update Thai translate.artiya4u2018-03-241-9/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | First add Thai translate.artiya4u2018-03-231-0/+819
| | | | | | | | | | | | |
| | | | | | | | | | | * | Merge branch 'master' into i18n-translator-reduxDan2018-03-2737-210/+308
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3708 from MetaMask/build-sourcemapsDan Finlay2018-03-275-9/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Tale Of Sourcemaps and Sentries
| * | | | | | | | | | | | | build - fix sourcemaps for devkumavis2018-03-241-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | lint - fixkumavis2018-03-241-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | sentry - npm scripts for uploading source mapskumavis2018-03-242-0/+71
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | build - always generate sourcemapskumavis2018-03-241-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | sentry - namespace files under metamask dirkumavis2018-03-241-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-244-7/+36
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | build - for build, write sourcemaps to dist/sourcemapskumavis2018-03-241-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | build - always create sourcemapskumavis2018-03-241-2/+2
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3718 from sandakersmann/patch-1Dan Finlay2018-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated one badge link to https
| * | | | | | | | | | | | | Updated one badge link to httpsMarius Kjærstad2018-03-251-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Updated one badge link to https
* | | | | | | | | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-2727-156/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update button styles
| * | | | | | | | | | | | | Update button stylesAlexander Tseung2018-03-2627-156/+166
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3722 from danjm/i2582-sendtoensnameDan Finlay2018-03-276-43/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Use ens-input component in send-v2 to allow sending to ens names.
| * | | | | | | | | | | | Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-266-43/+32
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3671 from lazaridiscom/masterkumavis2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | changes test to unit-integration-lint, closes #3650
| * | | | | | | | | | | changes test to unit-integration-lint, closes #3650Lazaridis2018-03-221-1/+1
|/ / / / / / / / / / /
| | | | | | | | | * | Empty commit.Dan2018-03-270-0/+0
| | | | | | | | | | |
| | | | | | | | | * | Add currentLocale to test states.Dan2018-03-246-6/+12
| | | | | | | | | | |
| | | | | | | | | * | i18n helper fetchLocale handles 404 gracefullyDan2018-03-241-4/+12
| | | | | | | | | | |
| | | | | | | | | * | Default current locale in metamask reducer to empty string.Dan2018-03-241-1/+1
| | | | | | | | | | |
| | | | | | | | | * | Include locales in served test files.Dan2018-03-241-0/+2
| | | | | | | | | | |
| | | | | | | | | * | Memoize t function in metamask-connectDan2018-03-241-1/+7
| | | | | | | | | | |
| | | | | | | | | * | Use extension api to get initial locale.Dan2018-03-225-6/+27
| | | | | | | | | | |
| | | | | | | | | * | Correct proptypes for t in new-account/create-form.jsDan2018-03-221-1/+1
| | | | | | | | | | |
| | | | | | | | | * | Correct reprice title and subtitle key names.Dan2018-03-222-4/+4
| | | | | | | | | | |
| | | | | | | | | * | Add en localeMessages to test states.Dan2018-03-222-0/+17
| | | | | | | | | | |
| | | | | | | | | * | Fix sender-to-recipient export and non-existent translation key.Dan2018-03-222-5/+3
| | | | | | | | | | |
| | | | | | | | | * | Correct connect reference in confirm-send-ether, confirm-deploy-contract, ↵Dan2018-03-223-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-display.
| | | | | | | | | * | Lint fixesDan2018-03-2214-18/+18
| | | | | | | | | | |
| | | | | | | | | * | Fix references to undefined 'this.props'Dan2018-03-222-25/+23
| | | | | | | | | | |
| | | | | | | | | * | Remove console.logsDan2018-03-222-2/+0
| | | | | | | | | | |
| | | | | | | | | * | Missed modifications of t() in merge resolution.Dan2018-03-223-4/+1
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'master' into i18n-translator-reduxDan2018-03-2237-786/+4409
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3662 from MetaMask/v4.3.0v4.3.0kumavis2018-03-222-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | V4.3.0
| * | | | | | | | | | | changelog - add note on i18n being beta onlykumavis2018-03-221-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | v4.3.0kumavis2018-03-222-1/+3
| | | | | | | | | | | |
| * | | | | | | | | | | changelog - update with new changeskumavis2018-03-221-3/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3658 from MetaMask/danjm-i3554-fix-editing-dapp-token-txskumavis2018-03-224-5/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Identify token transactions by method names
| * | | | | | | | | | | test - flat - add extra timeout, idk maybekumavis2018-03-221-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of ↵kumavis2018-03-223-5/+13
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
| * | | | | | | | | | | Identify token transactions by method names token data, and not just whether ↵Dan2018-03-203-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they've been add via metamask.
* | | | | | | | | | | | Merge pull request #3656 from MetaMask/trigun0x2-master2kumavis2018-03-223-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent batch request from opening multiple windows (3)
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-221-0/+873
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | trigun0x2-master
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension ↵kumavis2018-03-223-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trigun0x2-master
| | * | | | | | | | | | | | fix for lintJeffrey Tong2018-03-211-5/+5
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | remove console logJeffrey Tong2018-03-121-2/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | add comments that need clarification on naming conventionJeffrey Tong2018-03-123-9/+10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-082-2/+14
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3648 from raulk/patch-1kumavis2018-03-221-53/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | Minor adjustments to Spanish translation
| * | | | | | | | | | | | | Minor adjustments to Spanish translationRaúl Kripalani2018-03-211-53/+53
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3657 from MetaMask/revert-3628-3505_Transpile_to_ES5kumavis2018-03-222-8/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Revert "Issue 3505 | Transpile to ES5"
| * | | | | | | | | | | | Revert "Issue 3505 | Transpile to ES5"Thomas Huang2018-03-222-8/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3654 from MetaMask/i18n-deDan Finlay2018-03-221-0/+873
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | i18n - German Locale
| * | | | | | | | | | | i18n - fix german json formattingkumavis2018-03-221-7/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Tranlate to German (#3575)Nico2018-03-221-0/+874
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Translation into German
* | | | | | | | | | | Translate to Russian (#3644)Victor Charapaev2018-03-221-0/+819
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Russian localization
* | | | | | | | | | | hn _locales : message.json [HINDI] (#3611)N1X2018-03-222-2/+819
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | adding hn_IN `_locales`
* | | | | | | | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-219-198/+274
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update confirm transaction screen
| * | | | | | | | | | Update confirm transaction screenAlexander Tseung2018-03-219-198/+274
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3625 from bradford-hamilton/masterkumavis2018-03-211-0/+819
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add Dutch translations
| * | | | | | | | | | | add Dutch translationsBradford Lamson-Scribner2018-03-211-0/+819
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3641 from hermanjunge/masterkumavis2018-03-211-10/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Nuke the es_419 locale
| * | | | | | | | | | | Nuke the es_419 localeHerman Junge2018-03-211-10/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-212-246/+355
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [WIP] document/rearrange metamask-controller.js, re #3568
| * | | | | | | | | | | moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| | | | | | | | | | | |
| * | | | | | | | | | | add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-162-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| | | | | | | | | | | |
| * | | | | | | | | | | adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427kumavis2018-03-217-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | adds READMEs to folders, re #3427
| * | | | | | | | | | | | add READMEs to folders, re #3427Lazaridis2018-03-148-0/+49
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3640 from hermanjunge/complete-spanishkumavis2018-03-211-274/+322
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Complete Spanish Translation
| * | | | | | | | | | | | last pass (for now)Herman Junge2018-03-211-53/+53
| | | | | | | | | | | | |
| * | | | | | | | | | | | all 286 english strings were found in your localeHerman Junge2018-03-211-0/+66
| | | | | | | | | | | | |
| * | | | | | | | | | | | all 264 strings declared in your locale were found in the english oneHerman Junge2018-03-211-26/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | alphabetic sort of spanish messages.jsonHerman Junge2018-03-211-237/+237
| | | | | | | | | | | | |
* | | | | | | | | | | | | Gas inputs can be changed by up and down arrows (#3598)Dan J Miller2018-03-212-0/+3
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Up and down arrows can control gas inputs. * input-number.js just uses number type.
| | | | | | | | | | | * i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-2268-445/+636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props.
| | | | | | | | | | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-2149-217/+3983
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux
* | | | | | | | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplateskumavis2018-03-2112-108/+232
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | I3571 complete i18n templates
| * | | | | | | | | | | | Add i18n to tx statusThomas2018-03-212-2/+39
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-2137-107/+3699
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update onlySendToEtherAddress messageThomas2018-03-211-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add i18n in settings/infoThomas2018-03-212-14/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Started on Tx list i18nThomas2018-03-212-1/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | i18n Import flowThomas2018-03-212-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | I18n add-token.jsThomas2018-03-201-21/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove duplicate keysThomas2018-03-201-7/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add send screen templateDan Finlay2018-03-202-16/+28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add template for settings and infoDan Finlay2018-03-202-23/+34
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add recover and backup tempaltesDan Finlay2018-03-203-18/+42
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add login templatesDan Finlay2018-03-201-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add connecting indication templatesDan Finlay2018-03-202-6/+42
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3638 from MetaMask/DocumentTranslationScriptkumavis2018-03-211-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document translation script
| * | | | | | | | | | | | | Document translation scriptDan Finlay2018-03-211-1/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractorkumavis2018-03-213-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Retry tx refractor
| * | | | | | | | | | | | Take user home if an unapproved tx is dropped while they are viewing.Dan2018-03-211-0/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix styling regression from master merge.Dan2018-03-201-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve responsiveness of gas price row on confirm screen.Dan2018-03-201-0/+16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3633 from hermanjunge/spanishThomas Huang2018-03-211-5/+835
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add messages.json from @Grana69
| * | | | | | | | | | | | | Add messages.json from @Grana69Grana692018-03-211-5/+835
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3612 from hermanjunge/locale-verificationThomas Huang2018-03-211-0/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script to verify locale strings
| * | | | | | | | | | | | | Move file to development, fix JSHerman Junge2018-03-211-13/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add script to verify locale stringsHerman Junge2018-03-201-0/+96
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3613 from alvesjtiago/masterkumavis2018-03-211-0/+819
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portuguese translations.
| * | | | | | | | | | | | | Portuguese translations.Tiago Alves2018-03-201-0/+819
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3579 from matteopey/italian-translationkumavis2018-03-211-0/+819
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Italian translation
| * | | | | | | | | | | | | Update translation based on the new message.jsonmatteopey2018-03-201-1/+211
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clients because we mean Ethereum clientsmatteopey2018-03-161-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix as requested by reviewmatteopey2018-03-161-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add italian translationmatteopey2018-03-161-0/+609
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3623 from MetaMask/i#3554kumavis2018-03-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParams
| * | | | | | | | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParamsfrankiebee2018-03-201-0/+2
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3605 from lazaridiscom/masterkumavis2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use mkdirp for cross-platform, re #3426
| * | | | | | | | | | | | | | use mkdirp for cross-platform, re #3426Lazaridis2018-03-181-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3574 from marvinvista/masterkumavis2018-03-211-0/+609
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | Tagalog Translation
| * | | | | | | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed some special characters
| * | | | | | | | | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-0/+609
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3628 from ryan-rowland/3505_Transpile_to_ES5Dan Finlay2018-03-212-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 3505 | Transpile to ES5
| * | | | | | | | | | | | | Issue 3505 | Transpile to ES5Ryan Rowland2018-03-202-2/+8
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3489 from MetaMask/retry-tx-refractorThomas Huang2018-03-2123-86/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | Retry tx refractor
| * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2010-13/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fix Account Names being cropped (#3626)Alexander Tseung2018-03-206-11/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627)Dan J Miller2018-03-204-2/+19
| |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2059-3246/+3744
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'retry-tx-refractor' of ↵frankiebee2018-03-163-22/+49
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into retry-tx-refractor
| | * | | | | | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not edited.
| | * | | | | | | | | | | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | Ensure changes from customize gas modal opened from confirm screen are ↵Dan2018-03-152-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | captured for non-tx transactions.
| | * | | | | | | | | | | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-155-9/+640
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into retry-tx-refractorDan2018-03-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add to CHANGELOG.mdfrankiebee2018-03-161-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-164-460/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-158-12/+643
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \