aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
Commit message (Collapse)AuthorAgeFilesLines
* Bump json-rpc-engine to v4.0.0Dan Finlay2018-12-111-1/+1
|
* Deduplicate package.json fileWhymarrh Whitby2018-12-071-9/+5
| | | | | | | | | | | | From `npm install`: > npm WARN The package css-loader is included as both a dev and production dependency. > npm WARN The package eslint-plugin-react is included as both a dev and production dependency. > npm WARN The package file-loader is included as both a dev and production dependency. > npm WARN The package gulp is included as both a dev and production dependency. It's also worth noting that the Gulp version we were using was inconsistent and there is a published v4 release on GitHub.
* Update ganache-core to mitigate vulnWhymarrh Whitby2018-12-071-1/+1
| | | | | | | | | | | | | | | | | === npm audit security report === > # Run npm install --save-dev ganache-core@2.3.1 to resolve 1 vulnerability ┌───────────────┬──────────────────────────────────────────────────────────────┐ │ Moderate │ Memory Exposure │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Package │ bl │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Dependency of │ ganache-core [dev] │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Path │ ganache-core > level-sublevel > levelup > bl │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ More info │ https://nodesecurity.io/advisories/596 │ └───────────────┴──────────────────────────────────────────────────────────────┘
* npm uninstall openWhymarrh Whitby2018-12-071-1/+0
|
* Remove beefy dependency and its usagesWhymarrh Whitby2018-12-071-3/+0
| | | | | | | | | | | Refs #4768 Refs #5389 This changeset removes the beefy package that: 1. Was last published 2 yrs ago 2. Brought with it 1 moderate and 1 critical vulnerability 3. Was only used in scripts that no longer work
* circleci: Replace nsp with npm auditWhymarrh Whitby2018-12-071-1/+0
| | | | Refs #4751
* npm audit fixWhymarrh Whitby2018-12-061-2/+2
|
* Adds not yet functional gas price chart.Dan Miller2018-12-041-0/+2
|
* Pin two module versions to avoid flatmap-stream hack (#5839)Dan Finlay2018-11-271-2/+2
| | | | | | | | | The flatmap-stream module was compromised. MetaMask was NOT affected, but two of our dependencies could include it if they updated, so I am temporarily pinning those versions until they can be updated consciously. Related to https://github.com/dominictarr/event-stream/issues/116
* Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-221-2/+1
|\ | | | | Add Firefox and Brave support for Trezor
| * bump eth-trezor-keyringbrunobar792018-11-221-1/+1
| |
| * trezor v6brunobar792018-11-211-2/+1
| |
| * fix merge conflictsbrunobar792018-11-211-7/+9
| |\
| * \ fix merge conflictsbrunobar792018-11-071-4/+4
| |\ \
| * \ \ fix merge conflictsbrunobar792018-10-211-1/+1
| |\ \ \
| * \ \ \ fix conflictsbrunobar792018-10-171-14/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-061-4/+9
| |\ \ \ \ \
| * \ \ \ \ \ fix merge conflictsbrunobar792018-08-231-3/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-08-211-4/+13
| |\ \ \ \ \ \ \
| * | | | | | | | fix merge conflictsbrunobar792018-08-091-6/+6
| | | | | | | | |
* | | | | | | | | update package-lock.jsonbrunobar792018-11-211-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Version 5.0.3 (#5785)Dan Finlay2018-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Version 5.0.3 Includes a fix to the `version:bump` script that now correctly updates the changelog header. * Include inpage provider events
* | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * transactions - use safe-event-emitter over events * tests - pass a platform object on init with a noop showTransactionNotification * test - fix for tx-state-history-helper trying to reduce an empty array * deps - safe-event-emitter * lint
* | | | | | | | provide automatic changelog since last tag for linuxEsteban MIno2018-11-161-1/+2
| | | | | | | |
* | | | | | | | Update npm dependencies to reduce vulnerabilities (#5556)Bruno Barbieri2018-11-161-5/+5
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-301-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2
| * \ \ \ \ \ \ Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-301-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Validate signTypedData signer/address in eth-json-rpc-middleware
| | * | | | | | | deps - bump eth-json-rpc-middleware for signTypedData version bumpkumavis2018-10-301-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * / | | | | | deps - bump eth-block-tracker for fix (#5614)kumavis2018-10-261-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2
| * | | | | | deps - fix gulp ref to gulp#v4.0.0kumavis2018-10-201-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | sentry - include app state in ui errorskumavis2018-10-201-1/+1
| | | | | |
* | | | | | sentry - replace raven-js with sentry/browserkumavis2018-10-201-1/+1
| | | | | |
* | | | | | deps - bump eth-json-rpc-middleware for bugfixkumavis2018-10-191-1/+1
| | | | | |
* | | | | | sentry - update raven-jskumavis2018-10-191-1/+1
|/ / / / /
* | | | | deps - bump eth-token-tracker for ethjs-rpc bug in depskumavis2018-10-151-1/+1
| | | | |
* | | | | deps - bump eth-json-rpc-middleware for pending blockRef bugfixkumavis2018-10-121-1/+1
| | | | |
* | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Actions.spec.js * Error handling tests * Lint
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added drizzle app for testing * working * clean up * clean up script * make build step required * add drizzle-tests to .eslintignore * clean up drizzle run script * lint * use truffle unbox * undo eslintignore changes * revert change * dont use global * dont need this steps * use the new account flow * restore package-lock.json
* | | | | bump eth-json-rpc-middlewarebrunobar792018-10-101-1/+1
| | | | |
* | | | | deps - bump inpage-provider for drizzle workaroundkumavis2018-10-091-1/+1
| | | | |
* | | | | deps - bump metamask-inpage-provider for bug fixkumavis2018-10-091-1/+1
| | | | |
* | | | | provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-091-1/+1
| | | | |
* | | | | provider - enable subscription support (newHeads, logs)kumavis2018-10-081-5/+5
| | | | |
* | | | | deps - bump eth-block-tracker for safe-event-emitterkumavis2018-10-041-1/+1
| | | | |
* | | | | bugfix - bump provider for url auth supportkumavis2018-10-021-2/+1
| | | | |
* | | | | npm uninstall dot-only-hunterWhymarrh Whitby2018-10-011-1/+0
| | | | |
* | | | | Remove dot-only-hunter from test:unit scriptWhymarrh Whitby2018-10-011-1/+1
| | | | |
* | | | | Merge pull request #5325 from sam-aldis/patch-1Dan Finlay2018-10-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Debounce was breaking in update
| * | | | | Debounce was breaking in updateUKJP Design2018-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As found in issue here: https://github.com/MetaMask/metamask-extension/issues/5064 Pinned the version at 1.1.0 until the new version with breaking changes can be intergrated.
* | | | | | bugfix: bump version of inpage providerbitpshr2018-09-271-1/+1
| | | | | |
* | | | | | deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363)kumavis2018-09-261-1/+1
| | | | | |
* | | | | | Bugfix: Upgrade json-rpc-engine (#5348)Paul Bouchon2018-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bugfix: bump version of json-rpc-engine * Increase delay * Update lockfile * deps - json-rpc-engine@3.7.4
* | | | | | add mozilla lint jobbrunobar792018-09-261-2/+2
| | | | | |
* | | | | | Add build step to mozilla-lintDan Finlay2018-09-261-3/+3
| | | | | |
* | | | | | Add mozilla linter to dist script instead of main testDan Finlay2018-09-261-2/+2
| | | | | |
* | | | | | Add mozilla addon linter to test suiteDan Finlay2018-09-261-1/+3
|/ / / / /
* | | | | Implement latest EIP-712 protocolbitpshr2018-09-141-1/+3
| | | | |
* | | | | Add jsdoc gh-pages scriptDan Finlay2018-09-131-0/+1
| | | | |
* | | | | Add html reporter to test coverage outputWhymarrh Whitby2018-09-121-1/+1
| | | | |
* | | | | Upgrade obs-store and fix memory leaksConnor Christie2018-09-101-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0Dan J Miller2018-09-041-2/+2
|\ \ \ \ | | | | | | | | | | Update enzyme to the latest version 🚀
| * | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6greenkeeper[bot]2018-08-251-1/+1
| | | | |
| * | | | chore(package): update enzyme to version 3.4.4greenkeeper[bot]2018-08-251-1/+1
| | | | |
* | | | | Bump human-standard-token-abi version for DAI supportDan Finlay2018-08-311-1/+1
| | | | |
* | | | | Add react-media package to prevent rendering wallet-view twice in the popup viewAlexander Tseung2018-08-241-0/+1
|/ / / /
* | | / Minimum Browsers Supported (#4873)Antoine Nauleau2018-08-231-1/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Minimum supported browsers and version standard: add browsers and targets to .babelrc and package.json * Regenerate package.json, fix issue with comma in merge * Resolve merge conflicts * Regenerate package-lock.json * Revert to previous package-lock.json
* | | Merge pull request #5109 from MetaMask/MoveOutInpageProviderDan Finlay2018-08-221-0/+2
|\ \ \ | | | | | | | | Move inpage-provider and port-stream outside
| * | | Move inpage-provider and port-stream outsideDan Finlay2018-08-211-2/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream. To reduce the size of its dependencies, I have moved the [metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream). This allows them to be more easily depended & iterated on by external projects.
* / | bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-221-3/+3
|/ /
* | fix merge conflictsbrunobar792018-08-181-5/+10
| |
* | use eth-ledger-bridge-keyring from npmbrunobar792018-08-151-1/+1
| |
* | good progress adding pathsbrunobar792018-08-141-1/+1
| |
* | remove ledger libbrunobar792018-08-121-1/+0
| |
* | this should be ready to gobrunobar792018-08-121-0/+1
| |
* | refactor to support multiple hw walletsbrunobar792018-08-111-0/+1
| |
* | fix merge conflictsbrunobar792018-08-091-3/+3
|\ \
| * | Update eth-keyring-controller and eth-hd-keyring versions (#4989)Paul Bouchon2018-08-091-2/+2
| | |
| * | Reestablish old versions of eth-keyring-controller and eth-hd-keyringbitpshr2018-08-081-3/+3
| | |
* | | fix merge conflictsbrunobar792018-08-081-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
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install and uninstalling superstatic doesn't work on Node 8 at the time of writing: $ npm install -D superstatic@6 npm ERR! code ENOTSUP npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"}) npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1 npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1 npm ERR! notsup Required: {"node":">=0.10.0 <7"} npm ERR! notsup Actual: {"npm":"6.3.0","node":"8.11.3"} This commit removes the package (using Node 6!) and it will have to be replaced.
* | added crossbrowser support and error handlingbrunobar792018-08-011-0/+1
| |
* | fix dependenciesbrunobar792018-07-271-1/+1
| |
* | fix merge conflictsbrunobar792018-07-271-2/+13
|\|
| * Update Babel to Current Standard "babel-preset-env" (#4812)Antoine Nauleau2018-07-251-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | * Update .babelrc and package.json to babel-preset-env standard * Install babel-preset-env babel-stage-0 * Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix * Resolve PR #4812 merge conflicts * Merge #4847 Solves previous cache issues with cirlce-ci
* | added webrtc-adapter for browser compatbrunobar792018-07-271-0/+1
| |
* | fully working without tweaking ext. permissionbrunobar792018-07-271-1/+1
| |
* | working without permission issuesbrunobar792018-07-271-4/+4
| |
* | added instascan pkgbrunobar792018-07-241-0/+1
|/
* 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 ↵brunobar792018-07-131-0/+3
|\ | | | | | | initial-trezor-support
| * 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 ↵brunobar792018-07-071-1/+3
|\| | | | | | | initial-trezor-support
| * 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #4712 from MetaMask/lint-fixkumavis2018-07-041-3/+2
| |\ \ \ | | | | | | | | | | Lint - Lint all the things (without conflicts!)
| | * | | remove gulp eslint and cleanup gulpfilebrunobar792018-07-031-3/+2
| | | | |
| * | | | point eth-contract-metadata to repo masterEsteban MIno2018-07-031-1/+1
| |/ / /
* | | | update package-lock.jsonbrunobar792018-07-031-1/+1
| | | |
* | | | fix merge conflictsbrunobar792018-07-031-9/+9
|\| | |
| * | | npm 6 fresh lock + node 8 (#4675)Bruno Barbieri2018-07-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash
* | | | use latest eth-keyring-controllerbrunobar792018-07-021-1/+1
| | | |
* | | | fix merge conflictsbrunobar792018-07-021-2/+2
|\| | |
| * | | 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
| | | |
* | | | 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
|\| | |
| * | | Add script for auto-re-running tests on changeDan Finlay2018-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes.
* | | | 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
|/ / /
* | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-011-3/+6
|\ \ \ | | |/ | |/|
| * | 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-lock
| | * | 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 call
| | * | test - unit - fail if tests contain a .only callkumavis2018-05-261-1/+2
| | |/
| * / 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
| |\ | | | | | | Update ethjs to the latest version 🚀
| | * fix(package): update ethjs to version 0.4.0greenkeeper[bot]2018-05-121-1/+1
| | |
* | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-241-6/+8
|\| |
| * | Merge pull request #4321 from MetaMask/testingkumavis2018-05-231-1/+1
| |\ \ | | | | | | | | MM controller tests and reorganizing test files
| | * \ 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 screen
| | * | | | | | | | | 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 ↵kumavis2018-05-221-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | Jabher-develop
| | | * | | | | | bump extensionizer version to 1.0.1 (see ↵jabher2018-05-081-1/+1
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/extensionizer/pull/4)
| | * | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-221-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | Move account names out of KeyringController
| | | * | | | | 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
| | |/ / / / | |/| | | |
| * | | | | Bail after the first e2e test failureWhymarrh Whitby2018-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where the tests are sequential, every test after the first failure is bound for failure as well so we can bail after the first.
| * | | | | 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
| | |\ \ | | | | | | | | | | Build - fix sourcemaps
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | May fix #3999, but will need to see if Mozilla can reproduce the build with this updated repo. Switches our `uglifyify` dependency from the production one (under-maintained) to one that I've merged a critical patch into. I'm open to discussion of how else we might approach this problem here. Maybe we should use a different minification module entirely, remove minification, or maybe refactor our build system!
| * | | FirefoxThomas2018-05-021-2/+5
| |/ /
* | | 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 pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0Dan Finlay2018-04-241-1/+1
|\ \ | | | | | | Update ethjs-contract to the latest version 🚀
| * | 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.x
| * | 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 Script
| | * | Add JSDocs Page and ScriptDan Finlay2018-04-131-0/+3
| | | | | | | | | | | | | | | | Includes new script `npm run doc` for generating docs page.
| * | | 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
| | |\ \ | | | | | | | | | | Update gulp-sass to the latest version 🚀
| | | * | 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
| | |\ \ | | | | | | | | | | Update ethjs to the latest version 🚀
| | | * | fix(package): update ethjs to version 0.3.4greenkeeper[bot]2018-04-071-1/+1
| | | |/
| * | / Improve fox logo performanceDan Finlay2018-04-041-1/+1
| | |/ | |/| | | | | | | | | | | | | By including metamask-logo@2.1.4 Fixes #3621
* | | 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
| |\| | | | | | | | | | cb-254
| | * 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
| |\ \ | | | | | | | | | | | | cb-254
| * \ \ 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | cb-254
| * \ \ \ \ 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 ↵Alexander Tseung2018-02-091-7/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254
| * \ \ \ \ \ \ \ \ 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 ↵Alexander Tseung2017-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isInitialized
| * | | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Internationalize currencyDan Finlay2018-04-041-0/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3580
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | transactions - add origin to txMeta
| * | | | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update eslint-plugin-mocha to the latest version 🚀
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update sinon to the latest version 🚀
| * | | | | | | 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 ↵kumavis2018-03-281-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux
| * | | | | | | | 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
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 17:34:06 +0800