aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor onboarding flowAlexander Tseung2018-04-0216-235/+403
* Fix conf-tx renderAlexander Tseung2018-03-313-7/+50
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-315-23/+26
|\
| * Merge pull request #3808 from MetaMask/txMeta-originkumavis2018-03-314-16/+21
| |\
| | * transactions#newUnapprovedTransaction - dont default origin to metamaskfrankiebee2018-03-311-1/+1
| | * transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-312-3/+8
| | * deps - bump proviedr-enginefrankiebee2018-03-312-13/+13
| * | Merge pull request #3806 from MetaMask/build-dev-fixFrankie2018-03-312-7/+5
| |\ \ | | |/ | |/|
| | * build - properly set GULP_METAMASK_DEBUG on devkumavis2018-03-312-7/+5
| |/
* | Fix merge conflictsAlexander Tseung2018-03-31101-944/+1774
|\|
| * Merge pull request #3781 from MetaMask/ci-artifactsThomas Huang2018-03-3126-434/+833
| |\
| | * clean - mascara - remove unused codekumavis2018-03-301-2/+0
| | * mascara - server - serve bundles from distkumavis2018-03-303-14/+1
| | * npm scripts - rewrite default scripts to new task nameskumavis2018-03-301-6/+5
| | * build - split primary tasks into metamask + extension * dev + buildkumavis2018-03-301-7/+55
| | * build - cleanup commented codekumavis2018-03-301-27/+0
| | * build - fix scss + js reloadkumavis2018-03-301-8/+12
| | * build - fix copy devModekumavis2018-03-301-32/+31
| | * build - refactor scss compilation into single configkumavis2018-03-301-18/+63
| | * build - dev - fix js build orderkumavis2018-03-301-1/+1
| | * build - dev - run js tasks in parallel and set watch flagkumavis2018-03-301-3/+4
| | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-3081-512/+952
| | |\ | | |/ | |/|
| * | Merge pull request #3788 from danjm/i3787-make-t-available-via-contextkumavis2018-03-3073-451/+818
| |\ \
| | * \ Merge branch 'master' into i3787-make-t-available-via-contextDan2018-03-303-6/+29
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #3798 from MetaMask/e2e-selectorThomas Huang2018-03-303-6/+29
| |\ \ \
| | * | | ci - upload e2e test artifactskumavis2018-03-301-0/+3
| | * | | Merge branch 'master' into e2e-selectorkumavis2018-03-3013-89/+177
| | |\ \ \ | | |/ / / | |/| | |
| | * | | test - e2e - fix selector with extra div (?)kumavis2018-03-301-1/+1
| | * | | test - e2e - generate artifacts on test failurekumavis2018-03-302-6/+26
| | | * | Add changelog entry for language selection.Dan2018-03-301-0/+1
| | | * | Stopping wrapping provider children in div; stop wrapping old-ui in provider.Dan2018-03-303-6/+5
| | | * | Merge branch 'master' into i3787-make-t-available-via-contextDan2018-03-305-52/+67
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3795 from MetaMask/i3790-IncreaseSafeGasLimitkumavis2018-03-302-3/+4
| |\ \ \ \
| | * | | | Bump changelogDan Finlay2018-03-301-0/+1
| | * | | | Increase permitted safe gas limitDan Finlay2018-03-301-3/+3
| * | | | | Merge pull request #3794 from MetaMask/e2e-selectorThomas Huang2018-03-301-17/+16
| |\ \ \ \ \
| | * | | | | Better delays and fix logout css selectorThomas2018-03-301-3/+6
| | | |/ / / | | |/| | |
| | * | | | test - e2e - prefer css selectors over xpathkumavis2018-03-301-15/+11
| * | | | | i18n - Update German LocaleNico2018-03-301-24/+39
| * | | | | Merge pull request #3786 from FBrinkkemper/patch-1kumavis2018-03-301-8/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | changed zaad -> back-up woordenFBrinkkemper2018-03-291-8/+8
| |/ / / /
| | | * / Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-2973-450/+817
| | |/ / | |/| |
| * | | Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-292-3/+38
| |\ \ \
| | * | | Rename variable to be more understandableDan Finlay2018-03-292-5/+21
| | * | | Add test to reproduce issue behaviorDan Finlay2018-03-291-0/+19
| | | | * ci - build:announce - fix links to extension buildskumavis2018-03-291-4/+5
| | | | * ci - build:announce - fix linkkumavis2018-03-291-5/+5
| | | | * ci - build:announce - link all buildskumavis2018-03-291-2/+9
| | | | * ci - artifacts - upload extension builds, dont upload extension sourcekumavis2018-03-291-1/+4
| | | | * npm scripts - simplify and speed up dist buildskumavis2018-03-291-2/+1
| | | | * ci - upload whole dist + fix announce mascara urlkumavis2018-03-291-3/+3
| | | | * ui - fix typo in settingskumavis2018-03-291-1/+1
| | | | * ci - artifacts - simplify result pathkumavis2018-03-291-0/+1
| | | | * deps - update package-lockkumavis2018-03-292-88/+226
| | | | * ui - add guard against unset localekumavis2018-03-291-1/+2
| | | | * build - refactor copy and copy:watch (renamed to copy:dev)kumavis2018-03-291-44/+62
| | | | * ui - identicon - use relative link for ether logokumavis2018-03-291-1/+1
| | | | * ui - use relative location for imageskumavis2018-03-294-5/+5
| | | | * ui - fix relative url for deposit-ether-modalkumavis2018-03-291-1/+1
| | | | * ui - use relative url for i18n-helper fetching localeskumavis2018-03-291-1/+1
| | | | * mascara - fix proxy html script linkkumavis2018-03-291-1/+1
| | | | * deps - update pakage-lockkumavis2018-03-291-10/+97
| | | | * mascara - use sw-controller and other cleanupskumavis2018-03-295-40/+50
| | | | * build - extension - move js files to toplevelkumavis2018-03-296-14/+14
| | | | * build - mascara - copy proxy htmlkumavis2018-03-291-4/+13
| | | | * build - refactor js build processkumavis2018-03-291-43/+66
| | | | * build - fix mascara sourcemaps destkumavis2018-03-291-49/+46
| | | | * build - remove copy debugkumavis2018-03-291-1/+1
| | | | * build - remove deprecated deps taskkumavis2018-03-291-12/+0
| | | | * build - refactor copy taskskumavis2018-03-291-26/+46
| | | | * mascara - server - server bundles before static assets + serve dist/mascara i...kumavis2018-03-291-9/+8
| | | | * mascara - html - fix script locationskumavis2018-03-292-4/+4
| | | | * ci - announce QA build to GitHub pull requestkumavis2018-03-291-0/+12
| | | | * ui - css - use relative path for fontskumavis2018-03-291-14/+14
| | | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-296-49/+83
| | | | |\ | | |_|_|/ | |/| | |
| | | | * build - refactor build task generators + add mascara to standard build phasekumavis2018-03-291-86/+116
| | | | * mascara - move file locations to match extension structurekumavis2018-03-293-6/+6
| | | | * ci - upload mascara build as artifactkumavis2018-03-291-2/+1
| | | | * build - rename 'popup.js' to 'ui.js'kumavis2018-03-294-3/+3
| | | | * ui - change window title 'MetaMask Plugin' to 'MetaMask'kumavis2018-03-293-3/+3
| | | | * ci - publish dist as artifactkumavis2018-03-291-0/+3
| | | |/
* | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-3110-610/+694
* | | | Fix i18n merge conflictsAlexander Tseung2018-03-30120-849/+2004
|\| | |
| * | | Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-293-38/+54
| |\ \ \
| | * | | controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
| | * | | deps - bump ethjs-query to fix unhandled promise rejectionskumavis2018-03-292-14/+19
| | * | | deps - update package-lock (maybe greenkeeper forgot?)kumavis2018-03-291-23/+34
| | | |/ | | |/|
| * | | Merge pull request #3765 from MetaMask/sentry-error-simplifyFrankie2018-03-291-2/+12
| |\ \ \
| | * | | sentry - simplify error message 'Transaction Failed: known transaction'kumavis2018-03-281-2/+12
| | |/ /
| * | | Merge pull request #3767 from MetaMask/tx-state-undefined-valueFrankie2018-03-292-9/+17
| |\ \ \ | | |/ / | |/| |
| | * | tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-282-9/+17
| |/ /
| * | Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0kumavis2018-03-281-1/+1
| |\ \
| | * | 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
| |\ \ \
| | * | | 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 batchingkumavis2018-03-283-25/+35
| * | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-282-34/+41
| |\ \ \ \ \
| | * | | | | metamask-controller - fix typokumavis2018-03-281-1/+1
| | * | | | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-282-34/+41
| * | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammountskumavis2018-03-281-1/+8
| |\ \ \ \ \ \
| | * | | | | | 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.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.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.Dan2018-03-271-5/+0
| | |/ / / / / /
| * | | | | | | Merge pull request #3743 from gasolin/buyetherviewkumavis2018-03-281-2/+0
| |\ \ \ \ \ \ \
| | * | | | | | | remove unavailable goToBuyEtherView propTypegasolin2018-03-271-2/+0
| | |/ / / / / /
| * | | | | | | Merge pull request #3609 from MetaMask/i18n-translator-reduxkumavis2018-03-28100-650/+1155
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | 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 github.com:MetaMask/metamask-extensio...kumavis2018-03-281-1/+3
| | |\ \ \ \ \ \
| | | * | | | | | Don't query for undefined.Dan2018-03-281-1/+3
| | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-286-12/+194
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| * | | | | | | Merge pull request #3758 from MetaMask/i#3731kumavis2018-03-285-9/+154
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | 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 i18n-tra...kumavis2018-03-287-26/+448
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #3754 from MetaMask/selenium-e2eThomas Huang2018-03-285-1/+336
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | 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 stringsgasolin2018-03-271-11/+50
| * | | | | | | | Merge pull request #3746 from nyatla/masterkumavis2018-03-281-14/+62
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Update messages.jsonR.IIzuka2018-03-271-14/+62
| |/ / / / / / /
| | | * | | | | 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 22frankiebee2018-03-271-0/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #3735 from MetaMask/v4.4.0Dan Finlay2018-03-272-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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 startDan Finlay2018-03-272-2/+2
| |/ / / / / / / / / / /
| | | | | | | | | * | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2737-210/+308
| | | | | | | | | |\ \ \
| | | | | | | | | * | | | 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, net...Dan2018-03-223-3/+3
| | | | | | | | | * | | | 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
| | | | | | | | | |\ \ \ \
| | | | | | | | | * | | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-2268-445/+636
| | | | | | | | | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-2149-217/+3983
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | | Lint fixes.Dan2018-03-2016-11/+19
| | | | | | | | | * | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-203-7/+176
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re...Dan2018-03-2018-24/+29
| | | | | | | | | * | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2058-3688/+3208
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | Delete commented out code from i18n implementation that used globals.Dan2018-03-201-5/+0
| | | | | | | | | * | | | | | | | Delete old i18n helper files.Dan2018-03-202-76/+0
| | | | | | | | | * | | | | | | | Fetch localeMessages in front end only.Dan2018-03-203-16/+8
| | | | | | | | | * | | | | | | | Handle i18n with redux.Dan2018-03-1688-385/+538
| | | | | | | | | * | | | | | | | ui - settings - add option to set current localekumavis2018-03-151-0/+45
| | | | | | | | | * | | | | | | | Translation to JapaneseMami Mordovets2018-03-151-3/+602
| | | | | | | | | * | | | | | | | i18n - load locales manuallykumavis2018-03-1539-118/+197
| | | | | | | |_|/ / / / / / / / | | | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2918-91/+176
* | | | | | | | | | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27267-5943/+47127
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-274-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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)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 issueskumavis2018-03-271-1/+0
| * | | | | | | | | | | | | | | | Merge pull request #3730 from MetaMask/revert-3665-ci-buildDan Finlay2018-03-271-17/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #3695 from danjm/i3379-signtypedata-overflowThomas Huang2018-03-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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 - 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
| * | | | | | | | | | | | | | | Merge pull request #3711 from artiya4u/feature/thai_localekumavis2018-03-271-0/+819
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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 pull request #3708 from MetaMask/build-sourcemapsDan Finlay2018-03-275-9/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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 httpsMarius Kjærstad2018-03-251-1/+1
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-2727-156/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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.Dan2018-03-266-43/+32
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #3671 from lazaridiscom/masterkumavis2018-03-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
generated by cgit (git 2.34.1) at 2024-10-18 20:28:57 +0800