aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | * | | | | | | Update babelify to 8.0.0Thomas Huang2017-11-281-1/+1
| | | | * | | | | | | Update react, react-dom, and react-test-renderer to 15.6.2Thomas Huang2017-11-271-3/+3
| | | | * | | | | | | Update ethjs-query to v0.3.1Thomas Huang2017-11-271-1/+1
| | | | * | | | | | | Update Qunit to QunitJS v2.4.1Thomas Huang2017-11-271-1/+1
| | | | * | | | | | | Update to Enzyme 3.2.0Thomas Huang2017-11-261-1/+2
| | | | |/ / / / / /
| | | * | | | | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-081-1/+3
| | | |\| | | | | |
| | | | * | | | | | Update classnames for integration tests and add output/index.css to integrati...Dan2017-11-031-1/+1
| | | | * | | | | | Get current NewUI-flat tests working.Dan2017-11-031-0/+1
| | | | * | | | | | More lint fixesDan2017-11-021-0/+1
| | | * | | | | | | fix mascara buildfrankiebee2017-11-011-1/+1
| | | |/ / / / / /
| | | * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-0/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-3/+10
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-211-2/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-1/+20
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Refactor amount input: dynamic input width with vanilla js.Dan2017-10-131-1/+0
| | | | * | | | | | | | | Adds amount and gas field to sendV2.Dan2017-10-131-0/+1
| | | | * | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-3/+3
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Query for gas estimatesChi Kei Chan2017-09-291-2/+3
| | | | * | | | | | | | | | Merge branch 'master' into mmnChi Kei Chan2017-09-281-10/+13
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-201-2/+3
| | | | * | | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-191-21/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-191-7/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rateChi Kei Chan2017-09-141-0/+1
| | | | * | | | | | | | | | | | | Reapply conversion utility changes and fix calls to utility in pending-tx.Dan2017-09-141-0/+2
| | | | * | | | | | | | | | | | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-0/+2
| | | | * | | | | | | | | | | | | Revert "Overhaul currency conversion utility and update calls to utility in p...Chi Kei Chan2017-09-131-2/+0
| | | | * | | | | | | | | | | | | Overhaul currency conversion utility and update calls to utility in pending-tx.Dan2017-09-131-0/+2
| | | | * | | | | | | | | | | | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+1
| | | | * | | | | | | | | | | | | Add buttons; handle back; add yarn.lockChi Kei Chan2017-09-121-0/+1
| | | | * | | | | | | | | | | | | Fixes lint errors and adds stylelint-config-standard to package.jsonDan2017-08-311-0/+1
| | | | * | | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-141-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | [WIP] Add packages and tasks for linting scsssdtsui2017-08-141-3/+5
| | | | * | | | | | | | | | | | | | Merge branch 'master' into NewUI-flatkumavis2017-08-091-34/+37
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Add dependencies and JSX support (reactify), for global modal implementationsdtsui2017-08-091-0/+3
| | | | * | | | | | | | | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-071-2/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-071-3/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Migrate from css to scss + autoprefixersdtsui2017-08-071-0/+2
| | | | * | | | | | | | | | | | | | | | | Hook up css animationsdtsui2017-08-031-0/+2
| | | | * | | | | | | | | | | | | | | | | Add dependejncy: react-burger-menusdtsui2017-08-031-0/+1
* | | | | | | | | | | | | | | | | | | | | Debounce storage to avoid crashing pumpDan Finlay2018-01-261-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #3047 from MetaMask/fix-provider-json-parseKevin Serrano2018-01-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | deps - bump provider engine and infura-middleware for better retry and error ...kumavis2018-01-201-2/+2
| * | | | | | | | | | | | | | | | | | | | deps - bump providers for better JSON parse error messageskumavis2018-01-201-2/+2
| |/ / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / deps - bump json rpc engine for bugfixkumavis2018-01-231-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3023 from MetaMask/build-lock-gulpDan Finlay2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into build-lock-gulpThomas Huang2018-01-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | build - lock pre-release gulp dep to commitkumavis2018-01-181-1/+1
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | deps - bump infura provider for uri length limit fixkumavis2018-01-191-1/+1
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | deps - re-add eth-block-trackerkumavis2018-01-181-0/+1
* | | | | | | | | | | | | | | | | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-181-1/+0
* | | | | | | | | | | | | | | | | | | deps - bump json-rpc-engine for better errorskumavis2018-01-181-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'master' into i2826-SignBytesDan Finlay2018-01-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into infura-rest-apikumavis2018-01-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | deps - bump eth-json-infurakumavis2018-01-101-1/+1
| | * | | | | | | | | | | | | | | | | | | provider - infura - use infura REST apikumavis2018-01-091-2/+2
* | | | | | | | | | | | | | | | | | | | | Bump keyringController versionDan Finlay2018-01-161-3/+1
* | | | | | | | | | | | | | | | | | | | | Fix signTypedData bytes signingDan Finlay2018-01-141-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #2926 from MetaMask/gulp-npmlsDan Finlay2018-01-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | deps - gulp in dev deps onlykumavis2018-01-111-2/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update vinyl-buffer to version 1.0.1Thomas Huang2018-01-041-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-061-0/+1
|/ / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / chore(package): update vinyl-source-stream to version 2.0.0greenkeeper[bot]2017-12-231-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Add exit flag to mocha to exit after tests runThomas Huang2017-12-161-1/+1
* | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-141-1/+1
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc...kumavis2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-141-2/+1
* | | | | | | | | | | | | | | | | deps - bump eth-json-rpc-infurakumavis2017-12-141-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | network - for infura networks use the infura block tracker providerkumavis2017-12-141-1/+2
* | | | | | | | | | | | | | | | Version 3.13.2v3.13.2Dan Finlay2017-12-101-1/+1
* | | | | | | | | | | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Get notice version filtering working nicelyDan Finlay2017-11-291-0/+1
| * | | | | | | | | | | | | | | | Add optional version field to noticesDan Finlay2017-11-291-0/+1
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-301-7/+7
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update greenkeeper deps for masterThomas Huang2017-11-281-7/+7
* | | | | | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-291-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | / / / fix(package): update react-markdown to version 3.0.0greenkeeper[bot]2017-11-201-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add lint:fix command to gulp and npm-scriptsDaijiro Wachi2017-10-221-0/+1
* | | | | | | | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-241-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add Integration TestsChi Kei Chan2017-10-211-0/+1
| * | | | | | | | | | | | | | | Fix linterChi Kei Chan2017-10-211-1/+1
| * | | | | | | | | | | | | | | Add ShapeShift UIChi Kei Chan2017-10-211-1/+1
| * | | | | | | | | | | | | | | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-211-0/+1
| * | | | | | | | | | | | | | | Add missing presetsChi Kei Chan2017-10-211-0/+1
| * | | | | | | | | | | | | | | Shuffle tokensJacky Chan2017-10-211-0/+3
| * | | | | | | | | | | | | | | Add BackupPhraseScreenJacky Chan2017-10-211-0/+1
| * | | | | | | | | | | | | | | Add UniqueImageScreenJacky Chan2017-10-211-0/+1
| |/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Temporarily reversal of json-rpc-engineKevin Serrano2017-10-221-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f...kumavis2017-10-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into i2348-SelectAccountOnNewVaultThomas Huang2017-10-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update eth-keyring-controller dependencyChi Kei Chan2017-10-201-1/+1
| | |/ / / / / / / / / / / /
generated by cgit (git 2.34.1) at 2024-11-24 20:31:36 +0800