aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloadingkumavis2018-04-101-3/+4
|\
| * Disable the first time flow import button while isLoading is true.Dan2018-04-091-3/+4
* | Merge pull request #3852 from MetaMask/i3621-LogoPerformancekumavis2018-04-102-1/+3
|\ \
| * \ Merge branch 'master' into i3621-LogoPerformancekumavis2018-04-1098-2011/+6507
| |\ \ | |/ / |/| |
* | | Translate to Turkish (#3876)Mert Ozdag2018-04-102-0/+913
* | | Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0kumavis2018-04-101-1/+1
|\ \ \
| * | | fix(package): update gulp-sass to version 4.0.0greenkeeper[bot]2018-04-051-1/+1
* | | | Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4kumavis2018-04-101-1/+1
|\ \ \ \
| * | | | fix(package): update ethjs to version 0.3.4greenkeeper[bot]2018-04-071-1/+1
* | | | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-1061-1787/+4799
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix integration testsAlexander Tseung2018-04-076-19/+39
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0617-49/+315
| |\ \ \ \
| * | | | | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| * | | | | Revert "commit"Alexander Tseung2018-04-064-18/+7
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-065-3/+6
| |\ \ \ \ \
| * | | | | | commitAlexander Tseung2018-04-064-7/+18
| * | | | | | Fix confirm-sig-requests integration testAlexander Tseung2018-04-051-3/+3
| * | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0513-95/+239
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix integration testsAlexander Tseung2018-04-053-7/+28
| * | | | | | Use new design for showing seed wordsAlexander Tseung2018-04-041-1/+13
| * | | | | | commitAlexander Tseung2018-04-041-8/+2
| * | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0424-156/+250
| |\ \ \ \ \ \
| * | | | | | | Fix transaction confirmationsAlexander Tseung2018-04-044-35/+161
| * | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-036-17/+93
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0348-808/+5271
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix lint errorsAlexander Tseung2018-04-0313-414/+21
| * | | | | | | | | Add withRouter to I18nProvider componentAlexander Tseung2018-04-031-1/+6
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-31101-944/+1774
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-3110-610/+694
| * | | | | | | | | | | Fix i18n merge conflictsAlexander Tseung2018-03-30120-849/+2004
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2918-91/+176
| * | | | | | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27267-5943/+47127
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix react-router related exceptionsAlexander Tseung2018-02-102-2/+2
| * | | | | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-36/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-0947-173/+1349
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix lint errorsAlexander Tseung2018-02-024-10/+3
| * | | | | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to default...Dan2018-02-011-3/+7
| * | | | | | | | | | | | | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-0140-230/+1152
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0120-643/+674
| * | | | | | | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-30111-2410/+6087
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when isI...Alexander Tseung2017-12-152-2/+22
| * | | | | | | | | | | | | | | | | | Add route for signature requestAlexander Tseung2017-12-156-305/+454
| * | | | | | | | | | | | | | | | | | Add initialized checks for first time flow routesAlexander Tseung2017-12-156-83/+60
| * | | | | | | | | | | | | | | | | | Add route for Mascara confirm seedAlexander Tseung2017-12-154-120/+151
| * | | | | | | | | | | | | | | | | | Fix lint errorsAlexander Tseung2017-12-154-14/+44
| * | | | | | | | | | | | | | | | | | Add routes for mascaraAlexander Tseung2017-12-1513-198/+296
| * | | | | | | | | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1543-1468/+2065
* | | | | | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fixkumavis2018-04-071-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | metamask - never persist if state is missingkumavis2018-04-071-1/+4
| * | | | | | | | | | | | | | | | | | | metamask - never persist if state is missing datakumavis2018-04-071-3/+6
| * | | | | | | | | | | | | | | | | | | metamask - attempt recovery from empty vaultkumavis2018-04-071-0/+22
* | | | | | | | | | | | | | | | | | | | Merge pull request #3917 from MetaMask/kumavis-patch-3Frankie2018-04-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not foundkumavis2018-04-071-2/+4
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #3916 from MetaMask/4.5.5Frankie2018-04-072-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | 4.5.5v4.5.5kumavis2018-04-072-1/+3
| * | | | | | | | | | | | | | | | | | | changelog - add changes for v4.5.5kumavis2018-04-071-1/+7
| * | | | | | | | | | | | | | | | | | | v4.5.4kumavis2018-04-072-1/+3
| * | | | | | | | | | | | | | | | | | | changelog - add missing entrieskumavis2018-04-071-1/+3
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3901 from MetaMask/MM-QA-Guidekumavis2018-04-061-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update QA_Guide.mdThomas Huang2018-04-061-0/+3
| * | | | | | | | | | | | | | | | | | | Update QA_Guide.mdThomas Huang2018-04-061-1/+0
| * | | | | | | | | | | | | | | | | | | UpdateThomas2018-04-061-2/+4
| * | | | | | | | | | | | | | | | | | | Commit Metamask QA GuideThomas2018-04-061-0/+44
* | | | | | | | | | | | | | | | | | | | Merge pull request #3907 from MetaMask/fix-all-migrationskumavis2018-04-069-89/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | migrations - back fixesfrankiebee2018-04-069-89/+124
* | | | | | | | | | | | | | | | | | | | Merge pull request #3906 from MetaMask/migration-25Thomas Huang2018-04-064-3/+133
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | create migration 25frankiebee2018-04-064-3/+112
| * | | | | | | | | | | | | | | | | | | test - run live migrations over first time statefrankiebee2018-04-061-4/+25
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3904 from MetaMask/migrations-templateFrankie2018-04-062-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | meta - create a migration templatefrankiebee2018-04-062-0/+46
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodeskumavis2018-04-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir...Dan2018-04-041-2/+4
| * | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc...Dan2018-04-041-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #3883 from danjm/i3685-define-event-privatekey-importkumavis2018-04-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.jsDan2018-04-051-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886kumavis2018-04-062-27/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-062-40/+27
| * | | | | | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-052-1/+14
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-reportFrankie2018-04-064-14/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | migrator - dont overwrite error stack and warn to consolekumavis2018-04-061-2/+5
| * | | | | | | | | | | | | | | | | | | migrator - fix typokumavis2018-04-061-1/+1
| * | | | | | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structurekumavis2018-04-064-14/+77
* | | | | | | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891kumavis2018-04-062-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix populating txParams with undefined dataAlexander Tseung2018-04-062-1/+10
* | | | | | | | | | | | | | | | | | | | Merge pull request #3899 from MetaMask/migration-24-fixkumavis2018-04-062-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | make migration-24 compat with first-time-statefrankiebee2018-04-062-1/+13
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #3865 from MetaMask/openlinkinnewwindowThomas Huang2018-04-062-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump ChangelogKevin Serrano2018-04-051-0/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into openlink...Kevin Serrano2018-04-0513-95/+239
| |\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make token helpscout link open in new tab.Kevin Serrano2018-04-041-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #3882 from MetaMask/i#3791Kevin Serrano2018-04-053-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Change double-quotes to single-quotesThomas2018-04-052-2/+2
| * | | | | | | | | | | | | | | | | Update ChangelogThomas2018-04-051-0/+2
| * | | | | | | | | | | | | | | | | Merge branch 'master' into i#3791Thomas2018-04-052-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add target=_blank exportAsFileThomas2018-04-052-0/+2
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3884 from danjm/i3874-send-eth-to-selfKevin Serrano2018-04-051-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow from and to address to be the same in new-ui.Dan2018-04-051-3/+0
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3880 from MetaMask/v4.5.3v4.5.3Thomas Huang2018-04-052-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 4.5.3kumavis2018-04-052-1/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3879 from MetaMask/normalize-transactionskumavis2018-04-058-89/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-052-18/+20
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...frankiebee2018-04-056-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3878 from MetaMask/hot-fix-for-new-uikumavis2018-04-052-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add to CHANGELOG.mdfrankiebee2018-04-051-0/+2
| * | | | | | | | | | | | | | | | hot-fix new-ui - default to an object if identities is undefinedfrankiebee2018-04-051-1/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3875 from danjm/i3837-to-field-rinkeby-kovanThomas Huang2018-04-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Don't prevent user from setting an eth address in to field if there is no ens...Dan2018-04-051-2/+2
* | | | | | | | | | | | | | | | | Merge pull request #3869 from MetaMask/4.5.2kumavis2018-04-052-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 4.5.2v4.5.2kumavis2018-04-052-1/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3868 from MetaMask/chainid-fixkumavis2018-04-052-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | changelog - add note on txParams.chainId validation changekumavis2018-04-051-0/+2
| * | | | | | | | | | | | | | | | tx - txParams - allow chainId to be a hex stringkumavis2018-04-041-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3862 from MetaMask/webby-awards-fixKevin Serrano2018-04-041-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add webby awards to web3 block list.Dan Finlay2018-04-041-1/+5
|/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | add to CHANGELOG.mdfrankiebee2018-04-051-0/+2
| * | | | | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-053-0/+83
| * | | | | | | | | | | | | | transactions - normalize txParamsfrankiebee2018-04-054-80/+125
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734kumavis2018-04-044-17/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Address feedbackDavid Yoo2018-04-042-8/+24
| * | | | | | | | | | | | | | Fix testsDavid Yoo2018-04-031-1/+1
| * | | | | | | | | | | | | | Address Add Token design feedbackDavid Yoo2018-04-033-8/+12
* | | | | | | | | | | | | | | Merge pull request #3854 from MetaMask/v4.5.1Dan Finlay2018-04-042-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 4.5.1v.4.5.1kumavis2018-04-042-1/+3
| * | | | | | | | | | | | | | | changelog - add note on fixed NODE_ENV side effectskumavis2018-04-041-0/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3848 from MetaMask/i#3841kumavis2018-04-041-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Numberkumavis2018-04-041-2/+10
| * | | | | | | | | | | | | | | transactions - dont throw if chain id is not a stringfrankiebee2018-04-041-2/+2
| | | | | | | | | | | | | | | * Improve fox logo performanceDan Finlay2018-04-042-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3850 from MetaMask/ci-improvementsThomas Huang2018-04-045-74/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ci - metamaskbot-announce - gracefully handle missing PRkumavis2018-04-041-47/+58
| * | | | | | | | | | | | | | ci - job-publish - publish source+sourcemaps to sentry if new releasekumavis2018-04-044-11/+63
| * | | | | | | | | | | | | | ci - metamaskbot announce - js style changekumavis2018-04-041-5/+5
| * | | | | | | | | | | | | | ci - rename job-announce to job-publishkumavis2018-04-041-2/+2
| * | | | | | | | | | | | | | ci - announce - add sourcemaps to artifactskumavis2018-04-041-0/+3
| * | | | | | | | | | | | | | ci - load npm deps by revision to always get latest for buildkumavis2018-04-041-12/+16
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3846 from MetaMask/fetch-err-warnkumavis2018-04-045-44/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | app - currency - fix typo + prefer log over consolekumavis2018-04-041-2/+3
| * | | | | | | | | | | | | | app - currency - fix typokumavis2018-04-041-1/+1
| * | | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentrykumavis2018-04-045-44/+37
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3845 from MetaMask/build-fix-envThomas Huang2018-04-048-18/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-048-18/+15
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3835 from MetaMask/4.5.0v4.5.0Thomas Huang2018-04-032-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 4.5.0kumavis2018-04-032-2/+4
| * | | | | | | | | | | | | changelog - add note on localeskumavis2018-04-031-1/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3830 from MetaMask/build-perfThomas Huang2018-04-033-13/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perfkumavis2018-04-0341-974/+4192
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | build - use uglifyify and gulp-multi-process for better performancekumavis2018-03-313-64/+91
* | | | | | | | | | | | | | Merge pull request #3833 from MetaMask/ci-patchkumavis2018-04-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | ci - dont log unneeded env varkumavis2018-04-031-1/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3831 from MetaMask/i#3770Frankie2018-04-034-6/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests - fix txController tests so that txMetas have a from feildfrankiebee2018-04-031-2/+4
| * | | | | | | | | | | | | transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-032-3/+6
| * | | | | | | | | | | | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-032-1/+32
* | | | | | | | | | | | | | Merge pull request #3805 from MetaMask/ci-screenskumavis2018-04-0310-355/+3156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-0313-351/+341
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3828 from MetaMask/lint-sys-fixkumavis2018-04-038-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into lint-sys-fixkumavis2018-04-0318-302/+646
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | lint - remove use of 'event' globalkumavis2018-04-032-3/+3
| * | | | | | | | | | | | | | | lint - rules - disallow 'event' globalkumavis2018-04-031-0/+1
| * | | | | | | | | | | | | | | old-ui - lint fixeskumavis2018-04-034-4/+1
| * | | | | | | | | | | | | | | lint - include old uikumavis2018-04-031-2/+2
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfailsThomas Huang2018-04-035-343/+335
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adds simulation failure error messages to confirm screen.Dan2018-04-034-0/+44
| * | | | | | | | | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-033-343/+291
| | | * | | | | | | | | | | | ci:screens - turn on repeat in walkthrough gifkumavis2018-04-031-1/+1
| | | * | | | | | | | | | | | deps - update shell-parallelkumavis2018-04-032-4/+15
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-035-12/+130
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3829 from MetaMask/locales-lintThomas Huang2018-04-035-3/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | lint - i18n - ru - lint fixkumavis2018-04-031-0/+1
| * | | | | | | | | | | | | | | lint - lint json files in app/kumavis2018-04-034-3/+120
|/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-0327-642/+1120
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3826 from danjm/ensure-txparams-0xprefixedkumavis2018-04-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Ensure txParams are prefixed with 0x when sending.Dan2018-04-031-0/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3763 from MetaMask/i18n-helperkumavis2018-04-0311-125/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | deps - bump package-lock.jsonkumavis2018-04-031-47/+0
| * | | | | | | | | | | | | | Update translating-guide.mdkumavis2018-04-031-3/+6
| * | | | | | | | | | | | | | Merge branch 'master' into i18n-helperkumavis2018-04-03111-1215/+2523
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3783 from gornov/masterkumavis2018-04-031-172/+250
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Modified Russian localization. resolves #3534, #3644Gornov Dmitry2018-03-291-172/+250
* | | | | | | | | | | | | | | Merge pull request #3816 from MetaMask/kumavis-patch-2Dan Finlay2018-04-011-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | identicon - set blockies height and width to identicon diameterkumavis2018-03-311-3/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #3801 from danjm/i3684-txlistitemstestkumavis2018-03-312-0/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adds integration tests for rendering of tx list items.Dan2018-03-302-0/+189
* | | | | | | | | | | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlistkumavis2018-03-313-9/+22
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlistDan2018-03-3087-562/+1036
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Ensure correct address used when rendering transfer transactions.Dan2018-03-291-1/+2
| * | | | | | | | | | | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of...Dan2018-03-283-9/+21
* | | | | | | | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreenkumavis2018-03-316-21/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix lint and testsDan2018-03-302-4/+4
| * | | | | | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-3087-561/+1035
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Show insufficient funds on confirm screen on first render.Dan2018-03-302-1/+21
| * | | | | | | | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-281-0/+3
| * | | | | | | | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-28107-723/+1250
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-282-7/+56
| * | | | | | | | | | | | | | | Checking for sufficient balance in confirm ether screen; includes error messa...Dan2018-03-284-15/+97
* | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | i18n - further improve locale verifierkumavis2018-03-281-41/+28
| | | | | * | | | | | | | | | i18n - cleanup verify locales utilkumavis2018-03-281-66/+80
| | | | | * | | | | | | | | | i18n - fix casing for key 'downloadStateLogs'kumavis2018-03-288-8/+8
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | ci - screens - increase delay before setting provider typekumavis2018-03-311-1/+1
| | | | | * | | | | | | | | ci - breakout announce job to upload builds and screenshotskumavis2018-03-311-13/+35
| | | | | * | | | | | | | | ci - screens - add delay after setting networkkumavis2018-03-311-0/+1
| | | | | * | | | | | | | | ci - build:announce - fix script pathkumavis2018-03-311-1/+1
| | | | | * | | | | | | | | ci - build:announce - replace bash qith js because of string escaping nightmarekumavis2018-03-312-34/+52
| | | | | * | | | | | | | | ci - build:announce - fix json escapingkumavis2018-03-311-6/+6
| | | | | * | | | | | | | | ci - build:announce - fix json escapingkumavis2018-03-311-6/+6
| | | | | * | | | | | | | | ci - build:announce - fix shell script pathkumavis2018-03-311-1/+1
| | | | | * | | | | | | | | ci - build:announce - break out into shell scriptkumavis2018-03-312-32/+35
| | | | | * | | | | | | | | ci - build:announce - rewrite github comment to include walkthrough gifkumavis2018-03-311-9/+23
| | | | | * | | | | | | | | development - ci-screens - remove mocha wrapper that was losing exit codekumavis2018-03-313-117/+12
| | | | | * | | | | | | | | development - screens - fix screenshot on failurekumavis2018-03-311-3/+4
| | | | | * | | | | | | | | development - screens - screenshot on failurekumavis2018-03-311-4/+25
| | | | | * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-3126-667/+1249
| | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
generated by cgit (git 2.34.1) at 2024-10-14 22:15:03 +0800