Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto logout after specific time (#6558) | Chi Kei Chan | 2019-05-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | * Add i18n strings * Finish Auto timeout * Fix linter * Fix copies * Add unit test to Advanced Tab component * Add back actions and container * Add basic test to ensure container completeness * No zero, fix linters * restrict negative in input | ||||
* | Bump eth-json-rpc-filters and eth-contract-metadata | Thomas | 2019-05-09 | 1 | -2/+2 |
| | |||||
* | Allow dragging seed phrase during Confirm Seed Phrase (#6557) | Chi Kei Chan | 2019-05-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Add basic drag and drop functionality * Refactor seed phrase data structure * Insert to list when drop * Save before refactor * Finish DND * Fix linter * update package-lock.json * Address styling feedbacks * Add box shadow on hover * Finish adding unit tests * Remove describe.only | ||||
* | Adds NPM scripts for running a dapp, and dapp + chain, locally. (#6565) | Dan J Miller | 2019-05-06 | 1 | -0/+2 |
| | |||||
* | Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410) | kumavis | 2019-05-04 | 1 | -1/+0 |
| | | | | | | | | | | * Ensure home screen does not render if there are unapproved txs (#6501) * Ensure that the confirm screen renders before the home screen if there are unapproved txs. * Only render confirm screen before home screen on mount. * inpage - revert _metamask api to isEnabled isApproved isUnlocked | ||||
* | Update to eth-method-registry@1.2.0 (#6403) | Dan J Miller | 2019-04-18 | 1 | -1/+1 |
| | |||||
* | Adds e2e test for most web3 methods that dapps use (#6160) | Sneh Koul | 2019-04-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | * schema added * ui for the dapp added and schema.js changed according to the comments in PR * added tests for all web3 methods * Update run-all.sh * Update web3.spec.js to work with new onboarding flow * changes made according to the comments * Create stand alone script for web3 e2e tests. * Lint fixes for web3 e2e tests. | ||||
* | bump contract metadata | Esteban Mino | 2019-04-13 | 1 | -1/+1 |
| | |||||
* | pin eth-contract-metadata to last commit hash (#6396) | Esteban Miño | 2019-04-05 | 1 | -1/+1 |
| | |||||
* | bump ledger and trezor keyring (#6395) | Bruno Barbieri | 2019-04-04 | 1 | -2/+2 |
| | |||||
* | ci: Add build:test Gulp task for e2e build | Whymarrh Whitby | 2019-03-29 | 1 | -0/+1 |
| | |||||
* | Use webRequest to cancel all requests to infura in e2e tests. | Dan Miller | 2019-03-29 | 1 | -0/+1 |
| | |||||
* | Bump gaba version to avoid broken eth-contract-metadata | Whymarrh Whitby | 2019-03-21 | 1 | -1/+1 |
| | |||||
* | Add rollback script, move auto-changelog script (#6252) | Dan Finlay | 2019-03-20 | 1 | -1/+2 |
| | |||||
* | build - babel - move config to babelrc (#6284) | kumavis | 2019-03-12 | 1 | -23/+1 |
| | |||||
* | mascara - remove from project (#6283) | kumavis | 2019-03-12 | 1 | -16/+1 |
| | |||||
* | npm i -D ganache-core@2.5.3 | Whymarrh Whitby | 2019-03-12 | 1 | -1/+1 |
| | |||||
* | GABA: Integrate AddressBookController (#5847) | Paul Bouchon | 2019-03-12 | 1 | -0/+1 |
| | | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile | ||||
* | bump trezor-connect to v7 (#6224) | Bruno Barbieri | 2019-03-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6190 from whymarrh/tmp.RvdXXs4i | kumavis | 2019-02-26 | 1 | -1/+0 |
|\ | | | | | Remove public property from package.json file | ||||
| * | Remove public property from package.json file | Whymarrh Whitby | 2019-02-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | As per the package.json documentation [1] setting `"private": true` in the package.json file is enough for npm to refuse to publish it. The docs don't specify that a `public` key is respected. [1]:https://docs.npmjs.com/files/package.json#private | ||||
* | | Feature Flag + Mobile Sync (#5955) | Dan Finlay | 2019-02-26 | 1 | -1/+2 |
| | | |||||
* | | Remove unused CI jobs, rename e2e beta jobs | Whymarrh Whitby | 2019-02-21 | 1 | -6/+2 |
|/ | |||||
* | Fixed issue #5838 (#6001) | Jonathan Smirnoff | 2019-02-14 | 1 | -1/+1 |
| | | | Update changelog file | ||||
* | fix asset detection (#6049) | Bruno Barbieri | 2019-01-23 | 1 | -0/+1 |
| | |||||
* | Fix displayed time and date in the activity log. Remove vreme library, add ↵ | Alexander Tseung | 2018-12-14 | 1 | -2/+2 |
| | | | | luxon library. (#5932) | ||||
* | Bump json-rpc-engine to v4.0.0 | Dan Finlay | 2018-12-11 | 1 | -1/+1 |
| | |||||
* | Deduplicate package.json file | Whymarrh Whitby | 2018-12-07 | 1 | -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 vuln | Whymarrh Whitby | 2018-12-07 | 1 | -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 open | Whymarrh Whitby | 2018-12-07 | 1 | -1/+0 |
| | |||||
* | Remove beefy dependency and its usages | Whymarrh Whitby | 2018-12-07 | 1 | -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 audit | Whymarrh Whitby | 2018-12-07 | 1 | -1/+0 |
| | | | | Refs #4751 | ||||
* | npm audit fix | Whymarrh Whitby | 2018-12-06 | 1 | -2/+2 |
| | |||||
* | Adds not yet functional gas price chart. | Dan Miller | 2018-12-04 | 1 | -0/+2 |
| | |||||
* | Pin two module versions to avoid flatmap-stream hack (#5839) | Dan Finlay | 2018-11-27 | 1 | -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-v6 | Bruno Barbieri | 2018-11-22 | 1 | -2/+1 |
|\ | | | | | Add Firefox and Brave support for Trezor | ||||
| * | bump eth-trezor-keyring | brunobar79 | 2018-11-22 | 1 | -1/+1 |
| | | |||||
| * | trezor v6 | brunobar79 | 2018-11-21 | 1 | -2/+1 |
| | | |||||
| * | fix merge conflicts | brunobar79 | 2018-11-21 | 1 | -7/+9 |
| |\ | |||||
| * \ | fix merge conflicts | brunobar79 | 2018-11-07 | 1 | -4/+4 |
| |\ \ | |||||
| * \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 1 | -14/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 1 | -4/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-08-23 | 1 | -3/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-08-21 | 1 | -4/+13 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 1 | -6/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | update package-lock.json | brunobar79 | 2018-11-21 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Version 5.0.3 (#5785) | Dan Finlay | 2018-11-21 | 1 | -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) | Frankie | 2018-11-17 | 1 | -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 linux | Esteban MIno | 2018-11-16 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Update npm dependencies to reduce vulnerabilities (#5556) | Bruno Barbieri | 2018-11-16 | 1 | -5/+5 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-10-30 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2 | ||||
| * \ \ \ \ \ \ | Merge pull request #5596 from MetaMask/validateSignTypedData | kumavis | 2018-10-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Validate signTypedData signer/address in eth-json-rpc-middleware | ||||
| | * | | | | | | | deps - bump eth-json-rpc-middleware for signTypedData version bump | kumavis | 2018-10-30 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * / | | | | | | deps - bump eth-block-tracker for fix (#5614) | kumavis | 2018-10-26 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-10-21 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2 | ||||
| * | | | | | | deps - fix gulp ref to gulp#v4.0.0 | kumavis | 2018-10-20 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | sentry - include app state in ui errors | kumavis | 2018-10-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | sentry - replace raven-js with sentry/browser | kumavis | 2018-10-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | deps - bump eth-json-rpc-middleware for bugfix | kumavis | 2018-10-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | sentry - update raven-js | kumavis | 2018-10-19 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | deps - bump eth-token-tracker for ethjs-rpc bug in deps | kumavis | 2018-10-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | deps - bump eth-json-rpc-middleware for pending blockRef bugfix | kumavis | 2018-10-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | test - add actions unit tests (#5369) | Thomas Huang | 2018-10-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Actions.spec.js * Error handling tests * Lint | ||||
* | | | | | tests - integration - Add Drizzle tests (#5467) | Bruno Barbieri | 2018-10-10 | 1 | -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-middleware | brunobar79 | 2018-10-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | deps - bump inpage-provider for drizzle workaround | kumavis | 2018-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | deps - bump metamask-inpage-provider for bug fix | kumavis | 2018-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | provider - network - restore block-ref-rewrite middleware references | kumavis | 2018-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | provider - enable subscription support (newHeads, logs) | kumavis | 2018-10-08 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | deps - bump eth-block-tracker for safe-event-emitter | kumavis | 2018-10-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | bugfix - bump provider for url auth support | kumavis | 2018-10-02 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | npm uninstall dot-only-hunter | Whymarrh Whitby | 2018-10-01 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Remove dot-only-hunter from test:unit script | Whymarrh Whitby | 2018-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5325 from sam-aldis/patch-1 | Dan Finlay | 2018-10-01 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Debounce was breaking in update | ||||
| * | | | | | Debounce was breaking in update | UKJP Design | 2018-09-23 | 1 | -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 provider | bitpshr | 2018-09-27 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363) | kumavis | 2018-09-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Bugfix: Upgrade json-rpc-engine (#5348) | Paul Bouchon | 2018-09-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bugfix: bump version of json-rpc-engine * Increase delay * Update lockfile * deps - json-rpc-engine@3.7.4 | ||||
* | | | | | | add mozilla lint job | brunobar79 | 2018-09-26 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Add build step to mozilla-lint | Dan Finlay | 2018-09-26 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Add mozilla linter to dist script instead of main test | Dan Finlay | 2018-09-26 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Add mozilla addon linter to test suite | Dan Finlay | 2018-09-26 | 1 | -1/+3 |
|/ / / / / | |||||
* | | | | | Implement latest EIP-712 protocol | bitpshr | 2018-09-14 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Add jsdoc gh-pages script | Dan Finlay | 2018-09-13 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Add html reporter to test coverage output | Whymarrh Whitby | 2018-09-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Upgrade obs-store and fix memory leaks | Connor Christie | 2018-09-10 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0 | Dan J Miller | 2018-09-04 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Update enzyme to the latest version 🚀 | ||||
| * | | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | chore(package): update enzyme to version 3.4.4 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Bump human-standard-token-abi version for DAI support | Dan Finlay | 2018-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 1 | -0/+1 |
|/ / / / | |||||
* | | / | Minimum Browsers Supported (#4873) | Antoine Nauleau | 2018-08-23 | 1 | -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/MoveOutInpageProvider | Dan Finlay | 2018-08-22 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Move inpage-provider and port-stream outside | ||||
| * | | | Move inpage-provider and port-stream outside | Dan Finlay | 2018-08-21 | 1 | -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 migrated | kumavis | 2018-08-22 | 1 | -3/+3 |
|/ / | |||||
* | | fix merge conflicts | brunobar79 | 2018-08-18 | 1 | -5/+10 |
| | | |||||
* | | use eth-ledger-bridge-keyring from npm | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| | | |||||
* | | good progress adding paths | brunobar79 | 2018-08-14 | 1 | -1/+1 |
| | | |||||
* | | remove ledger lib | brunobar79 | 2018-08-12 | 1 | -1/+0 |
| | | |||||
* | | this should be ready to go | brunobar79 | 2018-08-12 | 1 | -0/+1 |
| | | |||||
* | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 1 | -0/+1 |
| | | |||||
* | | fix merge conflicts | brunobar79 | 2018-08-09 | 1 | -3/+3 |
|\ \ | |||||
| * | | Update eth-keyring-controller and eth-hd-keyring versions (#4989) | Paul Bouchon | 2018-08-09 | 1 | -2/+2 |
| | | | |||||
| * | | Reestablish old versions of eth-keyring-controller and eth-hd-keyring | bitpshr | 2018-08-08 | 1 | -3/+3 |
| | | | |||||
* | | | fix merge conflicts | brunobar79 | 2018-08-08 | 1 | -2/+2 |
|\| | | |||||
| * | | Update chromedriver pkg | Whymarrh Whitby | 2018-08-07 | 1 | -1/+1 |
| | | | |||||
| * | | Add static-server devDependency | Whymarrh Whitby | 2018-08-07 | 1 | -0/+1 |
| | | | |||||
| * | | Remove superstatic package | Whymarrh Whitby | 2018-08-07 | 1 | -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 handling | brunobar79 | 2018-08-01 | 1 | -0/+1 |
| | | |||||
* | | fix dependencies | brunobar79 | 2018-07-27 | 1 | -1/+1 |
| | | |||||
* | | fix merge conflicts | brunobar79 | 2018-07-27 | 1 | -2/+13 |
|\| | |||||
| * | Update Babel to Current Standard "babel-preset-env" (#4812) | Antoine Nauleau | 2018-07-25 | 1 | -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 compat | brunobar79 | 2018-07-27 | 1 | -0/+1 |
| | | |||||
* | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 1 | -1/+1 |
| | | |||||
* | | working without permission issues | brunobar79 | 2018-07-27 | 1 | -4/+4 |
| | | |||||
* | | added instascan pkg | brunobar79 | 2018-07-24 | 1 | -0/+1 |
|/ | |||||
* | added node version requirements | brunobar79 | 2018-07-22 | 1 | -1/+2 |
| | |||||
* | use latest keyring packages | brunobar79 | 2018-07-17 | 1 | -2/+2 |
| | |||||
* | remove account modal updated | brunobar79 | 2018-07-13 | 1 | -2/+2 |
| | |||||
* | catching up with develop | brunobar79 | 2018-07-13 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 1 | -0/+3 |
|\ | | | | | | | initial-trezor-support | ||||
| * | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -0/+1 |
| | | |||||
| * | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 1 | -0/+1 |
| | | |||||
| * | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 1 | -0/+1 |
| | | |||||
* | | update to temp dependencies | brunobar79 | 2018-07-12 | 1 | -2/+2 |
| | | |||||
* | | update package-lock.json | brunobar79 | 2018-07-07 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 1 | -1/+3 |
|\| | | | | | | | initial-trezor-support | ||||
| * | Merge remote-tracking branch 'upstream/develop' into HEAD | brunobar79 | 2018-07-04 | 1 | -16/+17 |
| |\ | |||||
| * \ | Merge branch 'develop' into portal-metamask | PhyrexTsai | 2018-06-01 | 1 | -2/+5 |
| |\ \ | |||||
| * | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 1 | -1/+3 |
| | | | | |||||
* | | | | package.json updated and tests passing | brunobar79 | 2018-07-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | tests are passing | brunobar79 | 2018-07-04 | 1 | -1/+0 |
| | | | | |||||
* | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -4/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #4712 from MetaMask/lint-fix | kumavis | 2018-07-04 | 1 | -3/+2 |
| |\ \ \ | | | | | | | | | | | Lint - Lint all the things (without conflicts!) | ||||
| | * | | | remove gulp eslint and cleanup gulpfile | brunobar79 | 2018-07-03 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | point eth-contract-metadata to repo master | Esteban MIno | 2018-07-03 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | update package-lock.json | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix merge conflicts | brunobar79 | 2018-07-03 | 1 | -9/+9 |
|\| | | | |||||
| * | | | npm 6 fresh lock + node 8 (#4675) | Bruno Barbieri | 2018-07-03 | 1 | -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-controller | brunobar79 | 2018-07-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests) | Dan | 2018-06-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | Use locally served dapp to test contract calls in e2e beta tests | Dan | 2018-06-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | notices - notices collection is now manually edited | kumavis | 2018-06-14 | 1 | -2/+0 |
| | | | | |||||
* | | | | use latest eth-trezor-keyring | brunobar79 | 2018-06-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixes | brunobar79 | 2018-06-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | point to new version of eth-trezor-keyring | brunobar79 | 2018-06-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix merge conflicts | Bruno | 2018-06-13 | 1 | -0/+1 |
|\| | | | |||||
| * | | | Add script for auto-re-running tests on change | Dan Finlay | 2018-06-13 | 1 | -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-keyring | Bruno | 2018-06-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | initial trezor support | Bruno | 2018-06-10 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-01 | 1 | -3/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 1 | -1/+1 |
| |\ \ | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | ||||
| | * | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |/| | | test - unit - fail if tests contain a .only call | ||||
| | * | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 1 | -1/+2 |
| | |/ | |||||
| * / | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 | kumavis | 2018-05-24 | 1 | -1/+1 |
| |\ | | | | | | | Update ethjs to the latest version 🚀 | ||||
| | * | fix(package): update ethjs to version 0.4.0 | greenkeeper[bot] | 2018-05-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-24 | 1 | -6/+8 |
|\| | | |||||
| * | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 1 | -1/+1 |
| |\ \ | | | | | | | | | MM controller tests and reorganizing test files | ||||
| | * \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -0/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 1 | -4/+14 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-08 | 1 | -9/+16 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | ||||
| | * | | | | | | | | | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 1 | -1/+1 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | ci - screens - continue screenshots through account creation + export account | kumavis | 2018-05-22 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' of https://github.com/Jabher/metamask-extension into ↵ | kumavis | 2018-05-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | Jabher-develop | ||||
| | | * | | | | | | bump extensionizer version to 1.0.1 (see ↵ | jabher | 2018-05-08 | 1 | -1/+1 |
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/extensionizer/pull/4) | ||||
| | * | | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | Move account names out of KeyringController | ||||
| | | * | | | | | Update eth-keyring-controller dependency | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-15 | 1 | -0/+1 |
| | |\| | | | | |||||
| | * | | | | | Merge e2e tests into one | Thomas | 2018-05-15 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | ci - add docs publish to job-publish-release | kumavis | 2018-05-19 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Bail after the first e2e test failure | Whymarrh Whitby | 2018-05-15 | 1 | -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 design | Alexander Tseung | 2018-05-12 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-12 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-09 | 1 | -1/+7 |
| |\| | | | |||||
| | * | | | Add storybook integration | Alexander Tseung | 2018-05-04 | 1 | -1/+7 |
| | |/ / | |||||
| * | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 1 | -6/+13 |
| |\| | | |||||
| | * | | Remove eth-block-tracker package | Alexander Tseung | 2018-05-03 | 1 | -1/+0 |
| | | | | |||||
| | * | | Pin chromedriver version to 2.36.0 | Alexander Tseung | 2018-05-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Adds nsp check to CircleCI tests | Alexander Tseung | 2018-05-03 | 1 | -0/+1 |
| | | | | |||||
| | * | | Adds sass-loader and style-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | |||||
| | * | | Adds path and resolve-url-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | |||||
| | * | | Adds css-loader and file-loader needed for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | |||||
| | * | | Merge pull request #4111 from MetaMask/build-fix-sourcemaps | Frankie | 2018-05-01 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Build - fix sourcemaps | ||||
| | | * | | development - add sourcemap debug tool | kumavis | 2018-04-28 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | build - minify via gulp-uglify-es instead of uglifyify | kumavis | 2018-04-28 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | test - unit - use ganache instead of deprecated block-tracker test util | kumavis | 2018-04-28 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 1 | -2/+2 |
| | | | | |||||
| | * | | Move uglifyify to MetaMask org | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 1 | -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! | ||||
| * | | | Firefox | Thomas | 2018-05-02 | 1 | -2/+5 |
| |/ / | |||||
* | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-14 | 1 | -10/+27 |
| | | | |||||
* | | | Unit tests for containers, utils and selectors in send_/ | Dan | 2018-05-05 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
|\ \ | | | | | | | Update ethjs-contract to the latest version 🚀 | ||||
| * | | fix(package): update ethjs-contract to version 0.2.0 | greenkeeper[bot] | 2018-04-19 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3934 from MetaMask/node-engines | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
|\ \ | | | | | | | package.json - update engines field to require node v8.x.x | ||||
| * | | package.json - update engines field to require node v8.x.x | kumavis | 2018-04-10 | 1 | -1/+1 |
| | | | |||||
* | | | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 1 | -1/+4 |
|\ \ | |||||
| * \ | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 1 | -0/+3 |
| |\ \ | | | | | | | | | Add JSDocs Page and Script | ||||
| | * | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Includes new script `npm run doc` for generating docs page. | ||||
| * | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'master' into i3580-InternationalizeCurrency | kumavis | 2018-04-10 | 1 | -3/+3 |
|\| | | |||||
| * | | Merge branch 'master' into i3621-LogoPerformance | kumavis | 2018-04-10 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 | kumavis | 2018-04-10 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Update gulp-sass to the latest version 🚀 | ||||
| | | * | | fix(package): update gulp-sass to version 4.0.0 | greenkeeper[bot] | 2018-04-05 | 1 | -1/+1 |
| | | |/ | |||||
| | * | | Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 | kumavis | 2018-04-10 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Update ethjs to the latest version 🚀 | ||||
| | | * | | fix(package): update ethjs to version 0.3.4 | greenkeeper[bot] | 2018-04-07 | 1 | -1/+1 |
| | | |/ | |||||
| * | / | Improve fox logo performance | Dan Finlay | 2018-04-04 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | By including metamask-logo@2.1.4 Fixes #3621 | ||||
* | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 1 | -7/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -9/+2 |
| |\| | | | | | | | | | | cb-254 | ||||
| | * | ci - job-publish - publish source+sourcemaps to sentry if new release | kumavis | 2018-04-04 | 1 | -7/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-03 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | cb-254 | ||||
| * \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -2/+12 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-03-31 | 1 | -2/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| * \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -11/+10 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -6/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -21/+36 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| * \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -11/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when ↵ | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isInitialized | ||||
| * | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -0/+1 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3580 | ||||
* | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -2/+1 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | deps - update shell-parallel | kumavis | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | lint - lint json files in app/ | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -2/+1 |
| |\| | | | | | | | | |||||
| * | | | | | | | | | development - ci-screens - remove mocha wrapper that was losing exit code | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 1 | -10/+9 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | ci - e2e+screens - add sleep to make sure ganache is ready | kumavis | 2018-03-31 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | ci - e2e+screens - use shell-parallel to run ganache | kumavis | 2018-03-31 | 1 | -3/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Ganache:start script with seed phrase | Thomas | 2018-03-31 | 1 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | development - create selenium screen shotter | kumavis | 2018-03-30 | 1 | -0/+1 |
| | | | | | | | | | |