| Commit message (Expand) | Author | Age | Files | Lines |
* | sentry - simplify error message 'Transaction Failed: known transaction' | kumavis | 2018-03-28 | 1 | -2/+12 |
* | Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
|\ |
|
| * | chore(package): update eslint-plugin-mocha to version 5.0.0 | greenkeeper[bot] | 2018-03-24 | 1 | -1/+1 |
* | | Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
|\ \ |
|
| * | | chore(package): update sinon to version 5.0.0 | greenkeeper[bot] | 2018-03-22 | 1 | -1/+1 |
* | | | Merge pull request #3752 from MetaMask/sentry-error-fix | Frankie | 2018-03-28 | 3 | -25/+35 |
|\ \ \ |
|
| * | | | sentry - simplify all ethjs errors for better batching | kumavis | 2018-03-28 | 3 | -25/+35 |
* | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 2 | -34/+41 |
|\ \ \ \ |
|
| * | | | | metamask-controller - fix typo | kumavis | 2018-03-28 | 1 | -1/+1 |
| * | | | | Fix bug where resetAccount does not clear network cache | Dan Finlay | 2018-03-28 | 2 | -34/+41 |
* | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts | kumavis | 2018-03-28 | 1 | -1/+8 |
|\ \ \ \ \ |
|
| * | | | | | Long token amounts in wallet are truncated with ellipsis. | Dan | 2018-03-27 | 1 | -1/+8 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x | kumavis | 2018-03-28 | 1 | -1/+3 |
|\ \ \ \ \ |
|
| * | | | | | Prefixes to addresses with 0x before sending. | Dan | 2018-03-27 | 1 | -1/+3 |
* | | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined | kumavis | 2018-03-28 | 1 | -1/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | Prevent users from adding custom token if decimals is an empty string. | Dan | 2018-03-27 | 1 | -1/+4 |
| |/ / / / / |
|
* | | | | | | Merge pull request #3740 from danjm/i3682-navigateTo-undefined | kumavis | 2018-03-28 | 1 | -5/+0 |
|\ \ \ \ \ \ |
|
| * | | | | | | Stop using navigateTo for external link in settings. | Dan | 2018-03-27 | 1 | -5/+0 |
| |/ / / / / |
|
* | | | | | | Merge pull request #3743 from gasolin/buyetherview | kumavis | 2018-03-28 | 1 | -2/+0 |
|\ \ \ \ \ \ |
|
| * | | | | | | remove unavailable goToBuyEtherView propType | gasolin | 2018-03-27 | 1 | -2/+0 |
| |/ / / / / |
|
* | | | | | | Merge pull request #3609 from MetaMask/i18n-translator-redux | kumavis | 2018-03-28 | 100 | -650/+1155 |
|\ \ \ \ \ \ |
|
| * | | | | | | i18n - fix locales inde | kumavis | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | ui - actions - fix log for background call | kumavis | 2018-03-28 | 1 | -1/+1 |
| * | | | | | | ui - settings - fix for currentLocale | kumavis | 2018-03-28 | 1 | -2/+3 |
| * | | | | | | ui - settings - derrive locales from index | kumavis | 2018-03-28 | 1 | -8/+1 |
| * | | | | | | i18n - derrive locale codes from index | kumavis | 2018-03-28 | 1 | -3/+2 |
| * | | | | | | development - genStates - simplify locale importing | kumavis | 2018-03-28 | 2 | -14/+2 |
| * | | | | | | i18n - add locales index json | kumavis | 2018-03-28 | 1 | -0/+19 |
| * | | | | | | test - integration - add locale build step | kumavis | 2018-03-28 | 1 | -2/+4 |
| * | | | | | | Merge branch 'i18n-translator-redux' of github.com:MetaMask/metamask-extensio... | kumavis | 2018-03-28 | 1 | -1/+3 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Don't query for undefined. | Dan | 2018-03-28 | 1 | -1/+3 |
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 6 | -12/+194 |
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
* | | | | | | | Merge pull request #3758 from MetaMask/i#3731 | kumavis | 2018-03-28 | 5 | -9/+154 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' into i#3731 | frankiebee | 2018-03-28 | 5 | -28/+118 |
| |\ \ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| * | | | | | | | migration for removing unnecessary transactions from state | frankiebee | 2018-03-28 | 4 | -3/+154 |
| * | | | | | | | transactions - only save up to 40 txs totall across all networks | frankiebee | 2018-03-27 | 1 | -6/+1 |
* | | | | | | | | Merge pull request #3755 from MetaMask/revert-3730-revert-3665-ci-build | Thomas Huang | 2018-03-28 | 1 | -3/+40 |
|\ \ \ \ \ \ \ \
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -2/+2 |
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -7/+8 |
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -0/+16 |
| * | | | | | | | ci - run e2e tests after build step | kumavis | 2018-03-28 | 1 | -18/+21 |
| * | | | | | | | Revert "Revert "Ci - introduce a build job"" | kumavis | 2018-03-28 | 1 | -0/+17 |
|/ / / / / / / |
|
| | | * | | | | deps - update package-lock | kumavis | 2018-03-28 | 1 | -3/+63 |
| | | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 7 | -26/+448 |
| | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #3754 from MetaMask/selenium-e2e | Thomas Huang | 2018-03-28 | 5 | -1/+336 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | deps - update package-lock | kumavis | 2018-03-28 | 1 | -0/+6 |
| * | | | | | | ci - run e2e jobs | kumavis | 2018-03-28 | 2 | -1/+18 |
| * | | | | | | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 59 | -429/+3417 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #3739 from gasolin/zhtwfixv4.4.0 | kumavis | 2018-03-28 | 1 | -11/+50 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | [zh-TW] fix translation and add missing strings | gasolin | 2018-03-27 | 1 | -11/+50 |
* | | | | | | | | Merge pull request #3746 from nyatla/master | kumavis | 2018-03-28 | 1 | -14/+62 |
|\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | | | |
|
| * | | | | | | | Update messages.json | R.IIzuka | 2018-03-27 | 1 | -14/+62 |
|/ / / / / / / |
|
| | * | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 2 | -8/+2 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 121 | -4075/+11734 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 98 | -886/+2555 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 3 | -18/+154 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Update selenium tests | Thomas | 2018-03-10 | 1 | -9/+7 |
| | * | | | | | | | | | Add selenium-webdriver and chromedriver | Thomas | 2018-03-10 | 1 | -0/+175 |
| | * | | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 428 | -4347/+70713 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | chromedriver, changed extension id(might need zip/crx file) | Thomas | 2018-01-19 | 3 | -4/+6 |
| | * | | | | | | | | | | Update | Thomas | 2018-01-18 | 3 | -1/+144 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | E2E testing with selenium | tmashuang | 2017-09-13 | 3 | -1/+144 |
| | | | | | | | | | * | | | Undo unnecessary line removals. | Dan | 2018-03-27 | 2 | -0/+2 |
| | | | | | | | | | * | | | Remove comments and console.logs | Dan | 2018-03-27 | 3 | -4/+3 |
| | | | | | | | | | * | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 21 | -140/+2922 |
| | | | | | | | | | |\ \ \
| |_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3737 from MetaMask/include-migration-22 | kumavis | 2018-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | include migration 22 | frankiebee | 2018-03-27 | 1 | -0/+1 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3735 from MetaMask/v4.4.0 | Dan Finlay | 2018-03-27 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | changelog - add note ofr i18n zh_tw th sl | kumavis | 2018-03-27 | 1 | -0/+1 |
| * | | | | | | | | | | | | v4.4.0 | kumavis | 2018-03-27 | 2 | -1/+3 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3732 from MetaMask/i3706-FixLocalStoreWrite | Dan Finlay | 2018-03-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Fix bug where full localStorage would crash on start | Dan Finlay | 2018-03-27 | 2 | -2/+2 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboarding | Thomas Huang | 2018-03-27 | 4 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Fix tests. | Dan | 2018-03-27 | 2 | -4/+5 |
| * | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | Improve responsivensss of unique image screen. | Dan | 2018-03-24 | 1 | -0/+4 |
| * | | | | | | | | | | | Pop uses new ui onboarding when in beta. | Dan | 2018-03-23 | 3 | -10/+5 |
* | | | | | | | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate | Thomas Huang | 2018-03-27 | 6 | -122/+321 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| * | | | | | | | | | | | | Merge branch 'master' into i3326-addtokenscreendesignupdate | Dan | 2018-03-27 | 38 | -218/+354 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Update add token integration tests. | Dan | 2018-03-26 | 1 | -9/+11 |
| * | | | | | | | | | | | | | Use new header on add token confirmation screen. | Dan | 2018-03-26 | 1 | -65/+68 |
| * | | | | | | | | | | | | | Updates Add token screen to latest design. | Dan | 2018-03-24 | 4 | -99/+256 |
| | |_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3728 from MetaMask/changle-updates-march26 | Thomas Huang | 2018-03-27 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | New-ui changelog updates (March 26) | Dan | 2018-03-27 | 1 | -0/+6 |
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3729 from MetaMask/test-timeout-fix | Thomas Huang | 2018-03-27 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | test - remove timeout causing mocha disconnect issues | kumavis | 2018-03-27 | 1 | -1/+0 |
* | | | | | | | | | | | | | | Merge pull request #3730 from MetaMask/revert-3665-ci-build | Dan Finlay | 2018-03-27 | 1 | -17/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Revert "Ci - introduce a build job" | Dan Finlay | 2018-03-27 | 1 | -17/+0 |
|/ / / / / / / / / / / / / / |
|
* / / / / / / / / / / / / / | migration for adding submittedTime to the txMeta (#3727) | Frankie | 2018-03-27 | 2 | -0/+71 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflow | Thomas Huang | 2018-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Signed type data notification handles long messages. | Dan | 2018-03-23 | 1 | -0/+1 |
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3665 from MetaMask/ci-build | Dan Finlay | 2018-03-27 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | ci - fix build job logging | kumavis | 2018-03-22 | 1 | -2/+5 |
| * | | | | | | | | | | | | | ci - add build step | kumavis | 2018-03-22 | 1 | -0/+14 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | i18n - sl Slovenian translation (#3724) | Filip Å | 2018-03-27 | 1 | -0/+819 |
* | | | | | | | | | | | | | i18n - zh_tw traditional chinese (taiwanese) | gasolin | 2018-03-27 | 1 | -0/+864 |
* | | | | | | | | | | | | | Merge pull request #3711 from artiya4u/feature/thai_locale | kumavis | 2018-03-27 | 1 | -0/+819 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -3/+3 |
| * | | | | | | | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -2/+2 |
| * | | | | | | | | | | | | Update Thai translate. | artiya4u | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | ๊๊Update Thai translate. | artiya4u | 2018-03-24 | 1 | -9/+9 |
| * | | | | | | | | | | | | First add Thai translate. | artiya4u | 2018-03-23 | 1 | -0/+819 |
| | | | | | | | | | | * | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 37 | -210/+308 |
| | | | | | | | | | | |\ \
| |_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3708 from MetaMask/build-sourcemaps | Dan Finlay | 2018-03-27 | 5 | -9/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | build - fix sourcemaps for dev | kumavis | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | lint - fix | kumavis | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | sentry - npm scripts for uploading source maps | kumavis | 2018-03-24 | 2 | -0/+71 |
| * | | | | | | | | | | | | | build - always generate sourcemaps | kumavis | 2018-03-24 | 1 | -2/+2 |
| * | | | | | | | | | | | | | sentry - namespace files under metamask dir | kumavis | 2018-03-24 | 1 | -2/+2 |
| * | | | | | | | | | | | | | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 4 | -7/+36 |
| * | | | | | | | | | | | | | build - for build, write sourcemaps to dist/sourcemaps | kumavis | 2018-03-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | build - always create sourcemaps | kumavis | 2018-03-24 | 1 | -2/+2 |
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3718 from sandakersmann/patch-1 | Dan Finlay | 2018-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Updated one badge link to https | Marius Kjærstad | 2018-03-25 | 1 | -1/+1 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3721 from alextsg/cb-944 | Dan Finlay | 2018-03-27 | 27 | -156/+166 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Update button styles | Alexander Tseung | 2018-03-26 | 27 | -156/+166 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3722 from danjm/i2582-sendtoensname | Dan Finlay | 2018-03-27 | 6 | -43/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 6 | -43/+32 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3671 from lazaridiscom/master | kumavis | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | changes test to unit-integration-lint, closes #3650 | Lazaridis | 2018-03-22 | 1 | -1/+1 |
|/ / / / / / / / / / / |
|
| | | | | | | | | * | | Empty commit. | Dan | 2018-03-27 | 0 | -0/+0 |
| | | | | | | | | * | | Add currentLocale to test states. | Dan | 2018-03-24 | 6 | -6/+12 |
| | | | | | | | | * | | i18n helper fetchLocale handles 404 gracefully | Dan | 2018-03-24 | 1 | -4/+12 |
| | | | | | | | | * | | Default current locale in metamask reducer to empty string. | Dan | 2018-03-24 | 1 | -1/+1 |
| | | | | | | | | * | | Include locales in served test files. | Dan | 2018-03-24 | 1 | -0/+2 |
| | | | | | | | | * | | Memoize t function in metamask-connect | Dan | 2018-03-24 | 1 | -1/+7 |
| | | | | | | | | * | | Use extension api to get initial locale. | Dan | 2018-03-22 | 5 | -6/+27 |
| | | | | | | | | * | | Correct proptypes for t in new-account/create-form.js | Dan | 2018-03-22 | 1 | -1/+1 |
| | | | | | | | | * | | Correct reprice title and subtitle key names. | Dan | 2018-03-22 | 2 | -4/+4 |
| | | | | | | | | * | | Add en localeMessages to test states. | Dan | 2018-03-22 | 2 | -0/+17 |
| | | | | | | | | * | | Fix sender-to-recipient export and non-existent translation key. | Dan | 2018-03-22 | 2 | -5/+3 |
| | | | | | | | | * | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, net... | Dan | 2018-03-22 | 3 | -3/+3 |
| | | | | | | | | * | | Lint fixes | Dan | 2018-03-22 | 14 | -18/+18 |
| | | | | | | | | * | | Fix references to undefined 'this.props' | Dan | 2018-03-22 | 2 | -25/+23 |
| | | | | | | | | * | | Remove console.logs | Dan | 2018-03-22 | 2 | -2/+0 |
| | | | | | | | | * | | Missed modifications of t() in merge resolution. | Dan | 2018-03-22 | 3 | -4/+1 |
| | | | | | | | | * | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 37 | -786/+4409 |
| | | | | | | | | |\ \
| |_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3662 from MetaMask/v4.3.0v4.3.0 | kumavis | 2018-03-22 | 2 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | changelog - add note on i18n being beta only | kumavis | 2018-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | v4.3.0 | kumavis | 2018-03-22 | 2 | -1/+3 |
| * | | | | | | | | | | | changelog - update with new changes | kumavis | 2018-03-22 | 1 | -3/+5 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3658 from MetaMask/danjm-i3554-fix-editing-dapp-token-txs | kumavis | 2018-03-22 | 4 | -5/+18 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | test - flat - add extra timeout, idk maybe | kumavis | 2018-03-22 | 1 | -0/+1 |
| * | | | | | | | | | | | ui - tx conf - only show special token tx conf screen for token send | kumavis | 2018-03-22 | 1 | -4/+8 |
| * | | | | | | | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m... | kumavis | 2018-03-22 | 3 | -5/+13 |
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Identify token transactions by method names token data, and not just whether ... | Dan | 2018-03-20 | 3 | -5/+13 |
* | | | | | | | | | | | | Merge pull request #3656 from MetaMask/trigun0x2-master2 | kumavis | 2018-03-22 | 3 | -6/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x... | kumavis | 2018-03-22 | 1 | -0/+873 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/ / / /
| | |/| | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into... | kumavis | 2018-03-22 | 3 | -6/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | fix for lint | Jeffrey Tong | 2018-03-21 | 1 | -5/+5 |
| | * | | | | | | | | | | | | remove console log | Jeffrey Tong | 2018-03-12 | 1 | -2/+0 |
| | * | | | | | | | | | | | | add comments that need clarification on naming convention | Jeffrey Tong | 2018-03-12 | 3 | -9/+10 |
| | * | | | | | | | | | | | | fixed multiple notification windows when executing batch | Jeffrey Tong | 2018-03-08 | 2 | -2/+14 |
| | * | | | | | | | | | | | | removed check for width & height on multiple popup windows | Jeffrey Tong | 2018-03-08 | 1 | -3/+1 |
* | | | | | | | | | | | | | | Merge pull request #3648 from raulk/patch-1 | kumavis | 2018-03-22 | 1 | -53/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Minor adjustments to Spanish translation | Raúl Kripalani | 2018-03-21 | 1 | -53/+53 |
| | |_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3657 from MetaMask/revert-3628-3505_Transpile_to_ES5 | kumavis | 2018-03-22 | 2 | -8/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Revert "Issue 3505 | Transpile to ES5" | Thomas Huang | 2018-03-22 | 2 | -8/+2 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3654 from MetaMask/i18n-de | Dan Finlay | 2018-03-22 | 1 | -0/+873 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | i18n - fix german json formatting | kumavis | 2018-03-22 | 1 | -7/+6 |
| * | | | | | | | | | | | Tranlate to German (#3575) | Nico | 2018-03-22 | 1 | -0/+874 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Translate to Russian (#3644) | Victor Charapaev | 2018-03-22 | 1 | -0/+819 |
* | | | | | | | | | | | hn _locales : message.json [HINDI] (#3611) | N1X | 2018-03-22 | 2 | -2/+819 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Merge pull request #3624 from alextsg/cb-941 | kumavis | 2018-03-21 | 9 | -198/+274 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 9 | -198/+274 |
* | | | | | | | | | | | Merge pull request #3625 from bradford-hamilton/master | kumavis | 2018-03-21 | 1 | -0/+819 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | add Dutch translations | Bradford Lamson-Scribner | 2018-03-21 | 1 | -0/+819 |
| | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3641 from hermanjunge/master | kumavis | 2018-03-21 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Nuke the es_419 locale | Herman Junge | 2018-03-21 | 1 | -10/+0 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3585 from lazaridiscom/laz/i3568 | kumavis | 2018-03-21 | 2 | -246/+355 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | moves setup-related code towads end of file, re #3568 | Lazaridis | 2018-03-17 | 1 | -115/+124 |
| * | | | | | | | | | | | add ESLint exceptions for //= and //-, re #3568 | Lazaridis | 2018-03-16 | 2 | -4/+4 |
| * | | | | | | | | | | | group all vault/keyring related methods together, re #3568 | Lazaridis | 2018-03-16 | 1 | -128/+130 |
| * | | | | | | | | | | | adds initial documentation, re #3568 | Lazaridis | 2018-03-16 | 1 | -40/+138 |
* | | | | | | | | | | | | Merge pull request #3504 from lazaridiscom/laz/i3427 | kumavis | 2018-03-21 | 7 | -0/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | add READMEs to folders, re #3427 | Lazaridis | 2018-03-14 | 8 | -0/+49 |
| | |_|_|_|_|_|_|_|/ / /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3640 from hermanjunge/complete-spanish | kumavis | 2018-03-21 | 1 | -274/+322 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | last pass (for now) | Herman Junge | 2018-03-21 | 1 | -53/+53 |
| * | | | | | | | | | | | | all 286 english strings were found in your locale | Herman Junge | 2018-03-21 | 1 | -0/+66 |
| * | | | | | | | | | | | | all 264 strings declared in your locale were found in the english one | Herman Junge | 2018-03-21 | 1 | -26/+8 |
| * | | | | | | | | | | | | alphabetic sort of spanish messages.json | Herman Junge | 2018-03-21 | 1 | -237/+237 |
* | | | | | | | | | | | | | Gas inputs can be changed by up and down arrows (#3598) | Dan J Miller | 2018-03-21 | 2 | -0/+3 |
|/ / / / / / / / / / / / |
|
| | | | | | | | | | | * | i18n redux solution doesn't require importing t() and passing state to each t... | Dan | 2018-03-22 | 68 | -445/+636 |
| | | | | | | | | | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-21 | 49 | -217/+3983 |
| | | | | | | | | | | |\
| |_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates | kumavis | 2018-03-21 | 12 | -108/+232 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Add i18n to tx status | Thomas | 2018-03-21 | 2 | -2/+39 |
| * | | | | | | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplates | Thomas | 2018-03-21 | 37 | -107/+3699 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Update onlySendToEtherAddress message | Thomas | 2018-03-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Add i18n in settings/info | Thomas | 2018-03-21 | 2 | -14/+17 |
| * | | | | | | | | | | | | | Started on Tx list i18n | Thomas | 2018-03-21 | 2 | -1/+7 |
| * | | | | | | | | | | | | | i18n Import flow | Thomas | 2018-03-21 | 2 | -5/+5 |
| * | | | | | | | | | | | | | I18n add-token.js | Thomas | 2018-03-20 | 1 | -21/+22 |
| * | | | | | | | | | | | | | Remove duplicate keys | Thomas | 2018-03-20 | 1 | -7/+1 |
| * | | | | | | | | | | | | | Add send screen template | Dan Finlay | 2018-03-20 | 2 | -16/+28 |
| * | | | | | | | | | | | | | Add template for settings and info | Dan Finlay | 2018-03-20 | 2 | -23/+34 |
| * | | | | | | | | | | | | | Add recover and backup tempaltes | Dan Finlay | 2018-03-20 | 3 | -18/+42 |
| * | | | | | | | | | | | | | Add login templates | Dan Finlay | 2018-03-20 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Add connecting indication templates | Dan Finlay | 2018-03-20 | 2 | -6/+42 |
| | |_|_|/ / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3638 from MetaMask/DocumentTranslationScript | kumavis | 2018-03-21 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Document translation script | Dan Finlay | 2018-03-21 | 1 | -1/+9 |
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3632 from MetaMask/retry-tx-refractor | kumavis | 2018-03-21 | 3 | -1/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Take user home if an unapproved tx is dropped while they are viewing. | Dan | 2018-03-21 | 1 | -0/+18 |
| * | | | | | | | | | | | | Fix styling regression from master merge. | Dan | 2018-03-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | Improve responsiveness of gas price row on confirm screen. | Dan | 2018-03-20 | 1 | -0/+16 |
* | | | | | | | | | | | | | Merge pull request #3633 from hermanjunge/spanish | Thomas Huang | 2018-03-21 | 1 | -5/+835 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Add messages.json from @Grana69 | Grana69 | 2018-03-21 | 1 | -5/+835 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3612 from hermanjunge/locale-verification | Thomas Huang | 2018-03-21 | 1 | -0/+96 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Move file to development, fix JS | Herman Junge | 2018-03-21 | 1 | -13/+13 |
| * | | | | | | | | | | | | | Add script to verify locale strings | Herman Junge | 2018-03-20 | 1 | -0/+96 |
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3613 from alvesjtiago/master | kumavis | 2018-03-21 | 1 | -0/+819 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Portuguese translations. | Tiago Alves | 2018-03-20 | 1 | -0/+819 |
| | |_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3579 from matteopey/italian-translation | kumavis | 2018-03-21 | 1 | -0/+819 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Update translation based on the new message.json | matteopey | 2018-03-20 | 1 | -1/+211 |
| * | | | | | | | | | | | | | Clients because we mean Ethereum clients | matteopey | 2018-03-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Fix as requested by review | matteopey | 2018-03-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Add italian translation | matteopey | 2018-03-16 | 1 | -0/+609 |
* | | | | | | | | | | | | | | Merge pull request #3623 from MetaMask/i#3554 | kumavis | 2018-03-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | new-ui - dont exclude `txParams.data` when editing and updating txParams | frankiebee | 2018-03-20 | 1 | -0/+2 |
| | |_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge pull request #3605 from lazaridiscom/master | kumavis | 2018-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | use mkdirp for cross-platform, re #3426 | Lazaridis | 2018-03-18 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge pull request #3574 from marvinvista/master | kumavis | 2018-03-21 | 1 | -0/+609 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Translate to Tagalog #3535 | Marvin Vista | 2018-03-15 | 1 | -0/+609 |
| | |_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3628 from ryan-rowland/3505_Transpile_to_ES5 | Dan Finlay | 2018-03-21 | 2 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Issue 3505 | Transpile to ES5 | Ryan Rowland | 2018-03-20 | 2 | -2/+8 |
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3489 from MetaMask/retry-tx-refractor | Thomas Huang | 2018-03-21 | 23 | -86/+485 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / / / / / /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 10 | -13/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Fix Account Names being cropped (#3626) | Alexander Tseung | 2018-03-20 | 6 | -11/+6 |
* | | | | | | | | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627) | Dan J Miller | 2018-03-20 | 4 | -2/+19 |
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 59 | -3246/+3744 |
| |\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext... | frankiebee | 2018-03-16 | 3 | -22/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not... | Dan | 2018-03-15 | 2 | -4/+34 |
| | * | | | | | | | | | | | Force gas min has correct precision and is set when editing gas if max. | Dan | 2018-03-15 | 3 | -7/+8 |
| | * | | | | | | | | | | | Ensure changes from customize gas modal opened from confirm screen are captur... | Dan | 2018-03-15 | 2 | -12/+8 |
| | * | | | | | | | | | | | Revert 'Set txMeta.time to reflect time of tx approval.' | Dan | 2018-03-15 | 1 | -3/+3 |
| | * | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-15 | 5 | -9/+640 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-03-16 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-16 | 4 | -460/+260 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 8 | -12/+643 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / / / / /
| | |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|