aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-071-2/+2
|\
| * Update chromedriver pkgWhymarrh Whitby2018-08-071-1/+1
| * Add static-server devDependencyWhymarrh Whitby2018-08-071-0/+1
| * Remove superstatic packageWhymarrh Whitby2018-08-071-1/+0
* | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-261-6/+26
|\|
| * Update Babel to Current Standard "babel-preset-env" (#4812)Antoine Nauleau2018-07-251-5/+16
| * added node version requirementsbrunobar792018-07-221-1/+2
| * use latest keyring packagesbrunobar792018-07-171-2/+2
| * remove account modal updatedbrunobar792018-07-131-2/+2
| * catching up with developbrunobar792018-07-131-1/+1
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-131-0/+3
| |\
| | * Fix existing unit testsAlexander Tseung2018-07-081-0/+1
| | * Use eth-method-registry to get method dataAlexander Tseung2018-07-071-0/+1
| | * Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-071-0/+1
| * | update to temp dependenciesbrunobar792018-07-121-2/+2
| * | update package-lock.jsonbrunobar792018-07-071-2/+2
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-071-1/+3
| |\|
| | * Merge remote-tracking branch 'upstream/develop' into HEADbrunobar792018-07-041-16/+17
| | |\
| | * \ Merge branch 'develop' into portal-metamaskPhyrexTsai2018-06-011-2/+5
| | |\ \
| | * | | Intergrate ENS with IPFSMikeCheng12082018-05-291-1/+3
| * | | | package.json updated and tests passingbrunobar792018-07-041-0/+1
| * | | | tests are passingbrunobar792018-07-041-1/+0
| * | | | fix merge conflictsbrunobar792018-07-041-4/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | update package-lock.jsonbrunobar792018-07-031-1/+1
| * | | | fix merge conflictsbrunobar792018-07-031-9/+9
| |\ \ \ \
| * | | | | use latest eth-keyring-controllerbrunobar792018-07-021-1/+1
| * | | | | fix merge conflictsbrunobar792018-07-021-2/+2
| |\ \ \ \ \
| * | | | | | use latest eth-trezor-keyringbrunobar792018-06-261-1/+1
| * | | | | | fixesbrunobar792018-06-231-1/+1
| * | | | | | point to new version of eth-trezor-keyringbrunobar792018-06-231-1/+1
| * | | | | | fix merge conflictsBruno2018-06-131-0/+1
| |\ \ \ \ \ \
| * | | | | | | upgrade eth-trezor-keyringBruno2018-06-131-1/+1
| * | | | | | | move TrezorKeyring to its own packageBruno2018-06-131-1/+1
| * | | | | | | initial trezor supportBruno2018-06-101-1/+2
* | | | | | | | test - run ganache rpc without vm errorskumavis2018-07-041-1/+1
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-041-4/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #4712 from MetaMask/lint-fixkumavis2018-07-041-3/+2
| |\ \ \ \ \ \ \
| | * | | | | | | remove gulp eslint and cleanup gulpfilebrunobar792018-07-031-3/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'develop' into network-remove-provider-enginekumavis2018-07-031-0/+1
|\| | | | | | |
| * | | | | | | point eth-contract-metadata to repo masterEsteban MIno2018-07-031-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-031-11/+12
|\| | | | | |
| * | | | | | npm 6 fresh lock + node 8 (#4675)Bruno Barbieri2018-07-031-9/+9
| | |_|/ / / | |/| | | |
| * | | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests)Dan2018-06-281-0/+1
| * | | | | Use locally served dapp to test contract calls in e2e beta testsDan2018-06-271-0/+1
| * | | | | notices - notices collection is now manually editedkumavis2018-06-141-2/+0
| | |/ / / | |/| | |
| * | | | Add script for auto-re-running tests on changeDan Finlay2018-06-131-0/+1
| |/ / /
* | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...kumavis2018-06-131-1/+1
* | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-0/+2
* | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-081-1/+1
* | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-081-1/+2
|\| | |
| * | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-011-3/+6
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-241-6/+8
| |\ \ \
| * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-151-2/+2
| * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-141-10/+27
| * | | | Unit tests for containers, utils and selectors in send_/Dan2018-05-051-1/+2
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-071-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | deps - bump eth-keyring-controller for bugfixkumavis2018-05-311-1/+1
| * | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controllerkumavis2018-05-301-1/+1
| |\ \ \ \
| | * | | | deps - bump eth-keyring-controller + update package-lockkumavis2018-05-301-1/+1
| * | | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-onlykumavis2018-05-301-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | test - unit - fail if tests contain a .only callkumavis2018-05-261-1/+2
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-291-1/+3
|\| | | |
| * | | | Add basic e2e tests for the new UIWhymarrh Whitby2018-05-251-0/+2
| |/ / /
| * | | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0kumavis2018-05-241-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | fix(package): update ethjs to version 0.4.0greenkeeper[bot]2018-05-121-1/+1
* | | | deps - bump eth-json-rpc-middleware for fetch bugfixkumavis2018-05-251-1/+1
* | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-251-1/+1
* | | | deps - bump json-rpc modules for bugfixeskumavis2018-05-251-2/+2
* | | | deps - bump eth-block-tracker for bugfixkumavis2018-05-241-1/+1
* | | | deps - eth-json-rpc-filters@2.0.0kumavis2018-05-231-1/+1
* | | | deps - eth-block-tracker@4.0.1kumavis2018-05-231-1/+1
* | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-6/+8
|\| | |
| * | | Merge pull request #4321 from MetaMask/testingkumavis2018-05-231-1/+1
| |\ \ \
| | * \ \ Merge branch 'develop' into testingtmashuang2018-05-221-0/+1
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into testingtmashuang2018-05-221-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into testingtmashuang2018-05-221-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into testingtmashuang2018-05-221-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' into testingThomas2018-05-171-4/+14
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into testingThomas2018-05-081-9/+16
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | setupUntrustedCommunication and setupTrustedCommunicationThomas2018-04-251-1/+1
| * | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-231-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update designs for Add Token screenAlexander Tseung2018-05-201-1/+1
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | ci - screens - continue screenshots through account creation + export accountkumavis2018-05-221-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'develop' into ci-publish-releasekumavis2018-05-221-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/Jabher/metamask-extension into J...kumavis2018-05-221-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensio...jabher2018-05-081-1/+1
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-221-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Update eth-keyring-controller dependencyWhymarrh Whitby2018-05-171-1/+1
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-151-0/+1
| | |\| | | | |
| | * | | | | | Merge e2e tests into oneThomas2018-05-151-2/+2
| * | | | | | | ci - add docs publish to job-publish-releasekumavis2018-05-191-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | deps - bump some bugfixeskumavis2018-05-171-2/+2
* | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-171-3/+3
* | | | | | | deps - remove web3-provider-enginekumavis2018-05-171-1/+0
* | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-171-1/+3
|/ / / / / /
* | | | | | Bail after the first e2e test failureWhymarrh Whitby2018-05-151-2/+2
* | | | | | Add new unlock screen designAlexander Tseung2018-05-121-0/+1
|/ / / / /
* | | | | Merge branch 'develop' into e2e-testsThomas2018-05-121-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update deep-extend and sshpkAlexander Tseung2018-05-101-1/+1
* | | | | Merge branch 'develop' into e2e-testsThomas2018-05-091-1/+7
|\| | | |
| * | | | Add storybook integrationAlexander Tseung2018-05-041-1/+7
| |/ / /
* | | | Merge branch 'develop' into e2e-testsThomas2018-05-041-6/+13
|\| | |
| * | | Remove eth-block-tracker packageAlexander Tseung2018-05-031-1/+0
| * | | Pin chromedriver version to 2.36.0Alexander Tseung2018-05-031-1/+1
| * | | Adds nsp check to CircleCI testsAlexander Tseung2018-05-031-0/+1
| * | | Adds sass-loader and style-loader packages for storybook integrationAlexander Tseung2018-05-021-0/+2
| * | | Adds path and resolve-url-loader packages for storybook integrationAlexander Tseung2018-05-021-0/+2
| * | | Adds css-loader and file-loader needed for storybook integrationAlexander Tseung2018-05-021-0/+2
| * | | Merge pull request #4111 from MetaMask/build-fix-sourcemapsFrankie2018-05-011-1/+1
| |\ \ \
| | * | | development - add sourcemap debug toolkumavis2018-04-281-0/+1
| | * | | build - minify via gulp-uglify-es instead of uglifyifykumavis2018-04-281-1/+0
| * | | | test - unit - use ganache instead of deprecated block-tracker test utilkumavis2018-04-281-1/+2
| |/ / /
| * | | rpc - bump provider-engine + eth-json-rpc-filterskumavis2018-04-261-2/+2
| * | | Move uglifyify to MetaMask orgDan Finlay2018-04-261-1/+1
| * | | Make minified builds more determinsticDan Finlay2018-04-251-1/+1
| | |/ | |/|
* / | FirefoxThomas2018-05-021-2/+5
|/ /
* | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0Dan Finlay2018-04-241-1/+1
|\ \
| * | fix(package): update ethjs-contract to version 0.2.0greenkeeper[bot]2018-04-191-1/+1
| |/
* | Merge pull request #3934 from MetaMask/node-enginesDan Finlay2018-04-241-1/+1
|\ \
| * | package.json - update engines field to require node v8.x.xkumavis2018-04-101-1/+1
* | | deps - bump sentry for more detailed fetch failurekumavis2018-04-241-1/+1
| |/ |/|
* | deps - update keyring controller and other eth-dependincesfrankiebee2018-04-181-1/+1
* | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-181-1/+4
|\ \
| * \ Merge pull request #3969 from MetaMask/i3966-AddJsDocsPageThomas Huang2018-04-181-0/+3
| |\ \
| | * | Add JSDocs Page and ScriptDan Finlay2018-04-131-0/+3
| * | | Add ComposableObservableStore for subscription managementbitpshr2018-04-131-1/+1
| |/ /
* | | Merge branch 'master' into i3580-InternationalizeCurrencykumavis2018-04-101-3/+3
|\| |
| * | Merge branch 'master' into i3621-LogoPerformancekumavis2018-04-101-2/+4
| |\ \
| | * \ 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
| | | |/
| * | / Improve fox logo performanceDan Finlay2018-04-041-1/+1
| | |/ | |/|
* | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-101-7/+3
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-041-9/+2
| |\|
| | * ci - job-publish - publish source+sourcemaps to sentry if new releasekumavis2018-04-041-7/+1
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-031-1/+2
| |\ \
| * \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-2/+12
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-311-2/+1
| |\ \ \ \
| * \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-311-11/+10
| |\ \ \ \ \
| * \ \ \ \ \ Fix i18n merge conflictsAlexander Tseung2018-03-301-6/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-271-21/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-7/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-5/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-11/+16
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when isI...Alexander Tseung2017-12-151-1/+2
| * | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-0/+1
* | | | | | | | | | | | Internationalize currencyDan Finlay2018-04-041-0/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | build - correctly set METAMASK_ENV via envifykumavis2018-04-041-2/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perfkumavis2018-04-031-2/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | deps - update shell-parallelkumavis2018-04-031-1/+1
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-031-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | lint - lint json files in app/kumavis2018-04-031-0/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-031-2/+1
| |\| | | | | | | |
| * | | | | | | | | development - ci-screens - remove mocha wrapper that was losing exit codekumavis2018-03-311-1/+1
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-311-10/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | ci - e2e+screens - add sleep to make sure ganache is readykumavis2018-03-311-2/+2
| * | | | | | | | | ci - e2e+screens - use shell-parallel to run ganachekumavis2018-03-311-3/+5
| * | | | | | | | | Ganache:start script with seed phraseThomas2018-03-311-2/+4
| * | | | | | | | | development - create selenium screen shotterkumavis2018-03-301-0/+1
| * | | | | | | | | test - add auto screen shotterkumavis2018-03-301-1/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | build - use uglifyify and gulp-multi-process for better performancekumavis2018-03-311-1/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3808 from MetaMask/txMeta-originkumavis2018-03-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | deps - bump proviedr-enginefrankiebee2018-03-311-1/+1
| | |/ / / / / / | |/| | | | | |
* / | | | | | | build - properly set GULP_METAMASK_DEBUG on devkumavis2018-03-311-1/+0
|/ / / / / / /
* | | | | | | npm scripts - rewrite default scripts to new task nameskumavis2018-03-301-6/+5
* | | | | | | npm scripts - simplify and speed up dist buildskumavis2018-03-291-2/+1
* | | | | | | deps - update package-lockkumavis2018-03-291-1/+1
* | | | | | | mascara - use sw-controller and other cleanupskumavis2018-03-291-2/+3
|/ / / / / /
* | | | | | deps - bump ethjs-query to fix unhandled promise rejectionskumavis2018-03-291-2/+2
* | | | | | 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
* | | | | | | | test - integration - add locale build stepkumavis2018-03-281-2/+4
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-281-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | ci - run e2e jobskumavis2018-03-281-1/+1
| * | | | | | | | Merge branch 'master' into selenium-e2eThomas Huang2018-03-281-1/+10
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-221-3/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-221-2/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into selenium-e2eThomas2018-03-151-6/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into selenium-e2eThomas2018-03-101-21/+54
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | chromedriver, changed extension id(might need zip/crx file)Thomas2018-01-191-3/+4
| * | | | | | | | | | | | UpdateThomas2018-01-181-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | E2E testing with seleniumtmashuang2017-09-131-1/+3
* | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-271-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | sentry - npm scripts for uploading source mapskumavis2018-03-241-0/+8
| * | | | | | | | | | | | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-241-0/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | changes test to unit-integration-lint, closes #3650Lazaridis2018-03-221-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Use extension api to get initial locale.Dan2018-03-221-0/+1
|/ / / / / / / / / / /
* | | | | | / / / / / Revert "Issue 3505 | Transpile to ES5"Thomas Huang2018-03-221-3/+1
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3605 from lazaridiscom/masterkumavis2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use mkdirp for cross-platform, re #3426Lazaridis2018-03-181-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* / | | | | | | | | Issue 3505 | Transpile to ES5Ryan Rowland2018-03-201-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us...kumavis2018-03-141-13/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use 'cross-env' for env-variables within npm scripts, re #3426Lazaridis2018-03-141-3/+4
| * | | | | | | | | Moved mock-dev.js and ui-dev.js to development folder.Vincent2018-03-131-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3501 from MetaMask/circleci-2.0kumavis2018-03-101-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | test - breakout npm script for building for integration testskumavis2018-03-101-1/+2
| * | | | | | | | chore(package): update gulp-stylelint to version 7.0.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | chore(package): update stylelint-config-standard to version 18.2.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | fix(package): update gulp-autoprefixer to version 5.0.0greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | deps - remove unused missippi depkumavis2018-03-101-1/+0
| * | | | | | | | chore(package): update browserify to version 16.1.1greenkeeper[bot]2018-03-101-1/+1
| * | | | | | | | deps - bump pumpkumavis2018-03-101-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-081-2/+2
|\| | | | | | |
| * | | | | | | Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0Thomas Huang2018-03-081-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | chore(package): update karma to version 2.0.0greenkeeper[bot]2017-12-221-1/+1
| * | | | | | | | Merge pull request #3259 from MetaMask/controllerStubskumavis2018-03-071-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Offline testingThomas Huang2018-02-161-1/+1
* | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-071-12/+46
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-071-2/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add browserify-unibabel to package.jsonCsaba Solya2018-03-061-2/+3
| | * | | | | | | | | Merge branch 'master' into edge-supportCsaba S2018-02-221-5/+34
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | add edge supportCsaba Solya2018-02-221-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Add version bumping scriptDan Finlay2018-03-031-0/+1
| * | | | | | | | | | Fix inpage provider name regressionDan Finlay2018-03-031-1/+1
| * | | | | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0Frankie2018-02-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fix(package): update metamascara to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
| * | | | | | | | | | Add node-sass to dev dependenciesDan Finlay2018-02-141-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'uat' into uat-nextDan2018-02-081-7/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into uatDan2018-02-081-7/+7
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to depsThomas2018-01-311-2/+4
| | | * | | | | | | Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0Thomas Huang2018-01-301-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | chore(package): update gulp-watch to version 5.0.0greenkeeper[bot]2018-01-071-1/+1
| | | * | | | | | | | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0Thomas Huang2018-01-301-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | chore(package): update mocha to version 5.0.0greenkeeper[bot]2018-01-181-1/+1
| | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0Thomas Huang2018-01-301-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | chore(package): update testem to version 2.0.0greenkeeper[bot]2018-01-251-1/+1
| | | * | | | | | | | | deps - bump eth-json-rpc-infura for kovan fixkumavis2018-01-261-1/+1
| | | |/ / / / / / / /
| * | / / / / / / / / [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-011-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' into uatThomas2018-01-231-3/+3
| * | | | | | | | | Remove duplicate eth-contract-metadataThomas2018-01-231-1/+1
| * | | | | | | | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-201-4/+33
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-171-5/+33
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | [NewUI-flat] Fix gulp build (#2975)Dan J Miller2018-01-161-1/+2
| | | * | | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735)Dan J Miller2018-01-121-0/+2
| | | * | | | | | | Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-041-4/+4
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-041-4/+26
| | | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | | * | | | | | Fix sign typed dataAlexander Tseung2017-12-301-3/+3
| | | * | | | | | | | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-231-19/+24
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge branch 'master' into NewUI-flatDan2017-12-211-2/+3
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | / | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-2/+4
| | | | * | | | | | Merge pull request #2615 from jpclark/NewUI-flatThomas Huang2017-11-291-8/+9
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
| | | | | * | | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden...Jason Clark2017-11-261-1/+0
| | | | | * | | | | | incremental commit of working blockie componentJason Clark2017-11-251-3/+1
| | | | | * | | | | | toggle wired up to preferences property storeJason Clark2017-11-251-4/+5
| | | | | * | | | | | incremental commitClark, Jason (Contractor)2017-11-241-4/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 12:42:31 +0800