aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade to Babel 7 (#6942)Mark Stacey2019-08-021-10/+10
| | | | | | | Babel 7 moved to a new configuration format, and they've scoped all of their packages under `@babel/`. This brings MetaMask in-line with dependencies we use that _already_ use Babel 7, and it eliminates a few unfortunate edge cases that can prevent dependencies from being correctly transpiled.
* I5849 incremental account security (#6874)Dan J Miller2019-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Implements ability to defer seed phrase backup to later * Adds incremental-security.spec.js, including test dapp that sends signed tx with stand alone localhost provider * Update metamask-responsive-ui for incremental account security changes * Update backup-notification style and fix responsiveness of seed phrase screen * Remove uneeded files from send-eth-with-private-key-test/ * Apply linguist flags in .gitattributes for send-eth-with-private-key-test/ethereumjs-tx.js * Improve docs in controllers/onboarding.js * Clean up metamask-extension/test/e2e/send-eth-with-private-key-test/index.html * Remove unnecessary newlines in a couple first-time-flow/ files * Fix import of backup-notification in home.component * Fix git attrs file
* Default Privacy Mode to ON, allow force sharing address (#6904)Whymarrh Whitby2019-08-011-1/+0
|
* Address book send plus contact list (#6914)Dan J Miller2019-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Style Send Header * Move Send to-row to send view and restyle * Add "Recents" group to select recipient view * Rename SendToRow to AddRecipient * Basic UI and Layout * New ENSInput component * wip - fuzzy search for input * small refactor * Add Dialog * contact list initial * initial error on invalid address * clean up edit * Click to open modal * Create AddToAddressBookModal component * Modal styling and layout * modal i18n * Add to Addressbook * ens wip * ens wip * ENS Resolution * Reset input * Send to explicit address * Happy Path Complete * Add back error checking * Reset send-to when emptying input * Add back warning object * Fix linter * Fix unit test #1 - fix import paths * Remove dead tests * One more to go * Fix all unit tests * add unit test for reducers and actions * test rendering AddRecipient * Add tests for dialog boxes in AddRecipient * Add test for validating * Fix linter * Fix e2e tests * Token send e2e fix * Style View Contact * Style edit-contact * Fix e2e * Fix from-import-beta-ui e2e spec * Make section header say "add recipient” by default * Auto-focus add recipient input * Update placeholder text * Update input title font size * Auto advance to next step if user paste a valid address * Ellipsify address when recipient is selected * Fix app header background color on desktop * Give each form row a margin of 16px * Use .container/.component naming pattern for ens-input * Auto-focus on input when add to addressbook modal is opened; Save on Enter * Fix and add unit test * Fix selectors name in e2e tests * Correct e2e test token amount for address-book-send changes * Adds e2e test for editing a transaction * Delete test/integration/lib/send-new-ui.js * Add tests for amount max button and high value error on send screen to test/e2e/metamask-ui.spec.js * lint and revert to address as object keys * add chainId based on current network to address book entry * fix test * only display contacts for the current network * Improve ENS message when not found on current network * Add error to indicate when network does not support ENS * bump gaba * address book, resolve comments * Move contact-list to its own component * De-duplicate getaddressbook selector and refactor name selection logic in contact-list-tab/ * Use contact-list component in contact-list-tab.component (i.e. in settings) * Improve/fix settings headers for popup and browser views * Lint fixes related to address book updates * Add 'My accounts' page to settings address book * Update add new contact button in settings to match floating circular design * Improve styles of view contact page * Improve styles and labels of the add-contact.component * Further lint fixes related to address book updates * Update unit tests as per address book updates * Ensure that contact list groups are sorted alphabetically * Refactor settings component to use a container for connection to redux; allow display of addressbook name in settings header * Decouple ens-input.component from send context * Add ens resolution to add contact screen in settings * Switching networks when an ens address is shown on send form removes the ens address. * Resolve send screen search for ensAddress to matching address book entry if it exists * Show resolved ens icon and address if exists (settings: add-contact.component) * Make the displayed and copied address in view-contact.component the checksummed address * Default alias state prop in AddToAddressBookModal to empty string * Use keyCode to detect enter key in AddToAddressBookModal * Ensure add-contact component properly updates after QR code detection * Fix display of all recents after clicking 'Load More' in contact list * Fix send screen contact searching after network switching * Code cleanup related to address book changes * Update unit tests for address book changes * Update ENS name not found on network message * Add ens registration error message * Cancel on edit mode takes user back to view screen * Adds support for memo to settings contact list view and edit screens * Modify designs of edit and view contact in popup environment * Update settings content list UX to show split columns in fullscreen and proper internal navigation * Correct background address book API usages in UI
* Switch from `npm` to `yarn` (#6843)Mark Stacey2019-07-311-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a solution to the constant lockfile churn issues we've had with `npm`, the project now uses `yarn` to manage dependencies. The `package-lock.json` file has been replaced with `yarn.lock`, which was created using `yarn import`. It should approximate the contents of `package-lock.json` fairly well, though there may be some changes due to deduplication. The codeowners file has been updated to reference this new lockfile. All documentation and npm scripts have been updated to reference `yarn` rather than `npm`. Note that running scripts using `npm run` still works fine, but it seemed better to switch those to `yarn` as well to avoid confusion. The `npm-audit` Bash script has been replaced with `yarn-audit`. The output of `yarn audit` is a bit different than `npm audit` in that it returns a bitmask to describe which severity issues were found. This made it simpler to check the results directly from the Bash script, so the associated `npm-audit-check.js` script was no longer required. The output should be exactly the same, and the information is still sourced from the same place (the npm registry). The new `yarn-audit` script does have an external dependency: `jq`. However, `jq` is already assumed to be present by another CI script, and is present on all CI images we use. `jq` was not added to `package.json` as a dependency because there is no official package on the npm registry, just wrapper scripts. We don't need it anywhere exept on CI anyway. The section in `CONTRIBUTING` about how to develop inside the `node_modules` folder was removed, as the advice was a bit dated, and wasn't specific to this project anyway.
* Resolve onion addresses (#6869)Alessandro Ricottone2019-07-241-1/+1
| | | | | * Resolve onion address * npm i content-hash@latest
* Bump eth-sig-util to 2.3.0 (#6896)Whymarrh Whitby2019-07-241-2/+2
| | | | | | * Bump eth-sig-util to 2.3.0 * Bump eth-keyring-controller to 4.x
* Serve CSS as an external file (#6894)Mark Stacey2019-07-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS is now served as an external file instead of being injected. This was done to improve performance. Ideally we would come to a middle ground between this and the former behaviour by injecting only the CSS that was required for the initial page load, then lazily loading the rest. However that change would be more complex. The hope was that making all CSS external would at least be a slight improvement. Performance metrics were collected before and after this change to determine whether this change actually helped. The metrics collected were the timing events provided by Chrome DevTools: * DOM Content Loaded (DCL) [1] * Load (L) [2] * First Paint (FP) [3] * First Contentful Paint (FCP) [3] * First Meaningful Paint (FMP) [3] Here are the results (units in milliseconds): Injected CSS: | Run | DCL | L | FP | FCP | FMP | | :--- | ---: | ---: | ---: | ---: | ---: | | 1 | 1569.45 | 1570.97 | 1700.36 | 1700.36 | 1700.36 | | 2 | 1517.37 | 1518.84 | 1630.98 | 1630.98 | 1630.98 | | 3 | 1603.71 | 1605.31 | 1712.56 | 1712.56 | 1712.56 | | 4 | 1522.15 | 1523.72 | 1629.3 | 1629.3 | 1629.3 | | **Min** | 1517.37 | 1518.84 | 1629.3 | 1629.3 | 1629.3 | | **Max** | 1603.71 | 1605.31 | 1712.56 | 1712.56 | 1712.56 | | **Mean** | 1553.17 | 1554.71 | 1668.3 | 1668.3 | 1668.3 | | **Std. dev.** | 33.41 | 33.43 | 38.16 | 38.16 | 38.16 | External CSS: | Run | DCL | L | FP | FCP | FMP | | :--- | ---: | ---: | ---: | ---: | ---: | | 1 | 1595.4 | 1598.91 | 284.97 | 1712.86 | 1712.86 | | 2 | 1537.55 | 1538.99 | 199.38 | 1633.5 | 1633.5 | | 3 | 1571.28 | 1572.74 | 268.65 | 1677.03 | 1677.03 | | 4 | 1510.98 | 1512.33 | 206.72 | 1607.03 | 1607.03 | | **Min** | 1510.98 | 1512.33 | 199.38 | 1607.03 | 1607.03 | | **Max** | 1595.4 | 1598.91 | 284.97 | 1712.86 | 1712.86 | | **Mean** | 1553.8025 | 1555.7425 | 239.93 | 1657.605 | 1657.605 | | **Std. dev.** | 29.5375 | 30.0825 | 36.88 | 37.34 | 37.34 | Unfortunately, using an external CSS file made no discernible improvement to the overall page load time. DCM and L were practically identical, and FCP and FMP were marginally better (well within error margins). However, the first paint time was _dramatically_ improved. This change seems worthwhile for the first paint time improvement alone. It also allows us to delete some code and remove a dependency. The old `css.js` module included two third-party CSS files as well, so those have been imported into the main Sass file. This was easier than bundling them in the gulpfile. The resulting CSS bundle needs to be served from the root because we're using a few `@include` rules that make this assumption. We could move this under `/css/` if desired, but we'd need to update each of these `@include` rules. Relates to #6646 [1]: https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded [2]: https://developer.mozilla.org/en-US/docs/Web/Events/load [3]: https://developers.google.com/web/fundamentals/performance/user-centric-performance-metrics
* Remove Babel transformations for older browser versions (#6812)Mark Stacey2019-07-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Babel config had previously supported all browsers with greater than 0.25% global usage (according to `browserlist`). This resulted in `babel-preset-env` including plugins sufficient to support the following minimum browser versions: ``` { "chrome": "49", "android": "4.4", "edge": "16", "firefox": "52", "ios": "9.3", "safari": "11" } ``` Instead, the babel config now explicitly supports chrome >= 58 and firefox >= 53. Chrome and Firefox are the only browsers we currently publish to, and these were the minimum versions with no additional Babel transformations. The minimum browser versions we support should be re-evaluated later, when we have added tests and documentation. The plugin 'transform-async-to-generator' has also been removed. It was used to translate async/await, but our browser targets all support async/await. Removing some of these transformations exposed bugs in `uglify-es` that only presented themselves in the production build. `gulp-uglify-es` has been updated to a version that uses `terser` instead of `uglify-es`, which has resolved these issues. Relates to #6805
* Remove Drizzle tests (#6855)Mark Stacey2019-07-161-1/+0
| | | | | | | The Drizzle tests have not been used for some time. They were used to ensure compatibility with newer versions of `web3` v1. If we want to re-add tests to ensure compatibility with newer `web3` versions, we should find some way of doing that more reliably than was done here - these tests were somewhat flaky and unreliable.
* Lint `.json` files (#6852)Mark Stacey2019-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | We've been using the `eslint-plugin-json` plugin for some time, but we haven't been visiting `.json` files in the lint script. The lint script has now been updated to incude `.json` files, which means any invalid JSON will result in a lint error. Unfortunately this JSON plugin doesn't seem to apply the other eslint rules (such as `key-spacing`) to the JSON files. I wasn't able to find a way to get that to work. Instead I manually auto-formatted each of the locale `message.json` files, which fixed many whitespace inconsistencies. The `states.json` file was deleted completely, as it appears to be unused. It wasn't a valid JSON file anyway, it was JavaScript. It looks like a `states.js` file is automatically generated, but an old copy was accidentally saved as `states.json` and included in the repo. Many duplicate key errors were found and fixed in the `development/states/` JSON files. `package-lock.json` was added to `.eslintignore` because it was very slow to lint, and linting it doesn't provide much value.
* Add eslint dependency (#6842)Mark Stacey2019-07-151-0/+1
| | | | | | | | We had forgotten to add `eslint` as a dependency, even though we use it directly. It had always worked because we have dependencies that also depend upon it. `eslint` has also been updated to v6, which necessitated two minor changes.
* Sync lockfile (#6833)Erik Marks2019-07-131-5/+5
|
* Remove unused AppVeyor configuration (#6840)Mark Stacey2019-07-121-1/+1
| | | | | | | | The AppVeyor configuration appears to be unused - this project is not connected to AppVeyor. After deleting the AppVeyor config, the JSDoc config was the last thing in the `development/tools` directory. That felt a little silly, so I moved it up to `development`.
* Add React and Redux DevTools (#6793)Whymarrh Whitby2019-07-111-0/+6
| | | | | | | | | * Add React and Redux DevTools * Conditionally load react-devtools * Add start:dev npm script to run the app with devtools Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Replace deprecated shell-parallel with concurrently (#6807)Whymarrh Whitby2019-07-101-4/+4
| | | | | | * Replace shell-parallel with concurrently * Update ganache-cli
* Remove job-screens CI job (#6823)Whymarrh Whitby2019-07-091-6/+0
| | | | | * Remove job-screens CI job * Remove unused dependencies, now that job-screens is gone
* Replace react-addons-css-transition-group (#6816)Mark Stacey2019-07-081-2/+1
| | | | | | | | | This package is deprecated, and is incompatible with React v16. It has been replaced by `react-test-renderer`, which has a drop-in replacement for `react-addons-css-transition-group`. Strangely, `react-test-renderer` was already listed as a dependency despite not being used. I had to downgrade it, as the version already listed was for React v16, and we're still using React v15.
* Remove unused `babel-polyfill` dependency (#6814)Mark Stacey2019-07-061-1/+0
| | | | The lockfile hasn't changed because this package is a dependency of `fetch-mock`.
* Remove unused Babel transformations (#6811)Mark Stacey2019-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The `stage-0` Babel preset has been replaced with the specific Babel plugins that we depend upon. We don't use most of `stage-0`, so this allowed us to remove many unnecessary transformations. We had to remove this preset soon anyway, because all of the stage presets are deprecated in Babel 7. The `stage-0` preset consisted of these plugins: ``` "transform-do-expressions" "transform-function-bind" "transform-class-constructor-call" "transform-export-extensions" "transform-class-properties" "transform-decorators" "syntax-dynamic-import" "syntax-trailing-function-commas" "transform-async-generator-functions" "transform-async-to-generator" "transform-exponentiation-operator" "transform-object-rest-spread" ``` Of that list, only 'transform-class-properties', 'transform-object- rest-spread', and 'transform-async-to-generator' were being used.
* Remove unused `gulp-uglify` dependency (#6810)Mark Stacey2019-07-061-1/+0
| | | | The switch was made to `gulp-uglify-es` some time ago, but `gulp-uglify` was never removed.
* Remove `disc` (#6801)Mark Stacey2019-07-041-2/+0
| | | | | The `disc` gulp command no longer works. I wasn't able to fix this easily, so instead it has been removed. We can probably find something better to replace it with.
* Omit integration tests from default test script (#6803)Mark Stacey2019-07-041-1/+1
| | | | | | The integration tests are slow, and rather inconvenient to run in development on a regular basis (they break if you move the mouse). They have been removed from the `test` script, to make running `test` frequently during development less painful.
* Move e2e tests out of beta dir (#6785)Whymarrh Whitby2019-07-031-7/+7
|
* Update eth-contract-metadata to use published registry version (#6784)Whymarrh Whitby2019-07-031-2/+2
|
* Update asmcrypto.js to latest version (#6767)Mark Stacey2019-07-031-1/+1
| | | | | | | | | | | | This silences a warning message that was printed to the console whenever this module was loaded during tests. The API changes between these two versions were reviewed carefully for differences. The only difference made was to `PBKDF2_HMAC_SHA256.bytes`, which was replaced by `Pbkdf2HmacSha256`. The length argument no longer has a default value, so it has been set to match what the default value was in the previous version we used, which is 32 (the SHA256 hash size).
* Move Browserify transforms to gulpfile (#6768)Mark Stacey2019-07-021-7/+1
| | | | | | | | | | | | The flat tests also rely upon these transformations, yet invoke browserify from the command line rather than using the gulpfile. The transformations have been specified on the command line for those instead. Of course it's not ideal to have the same transformations listed in two different places, but the plan is to delete the flat tests soon anyway, so this should suffice until then. Closes #4538
* Generate complete source maps (#6756)Mark Stacey2019-06-271-1/+0
| | | | | | | | | | | | | The source maps generated previously were mapping the bundled files to the post-Babel files - they weren't showing mapping to the source files as written. It looks like this was a result of `reactify` being used in addition to babel - that transformation must have dropped the source maps. `reactify` still needs to be listed as a dependency because it is an unlisted requirement of the `boron` package, which we use. We don't need to use it to create our bundles though, as Babel already performs the transformations we need.
* Merge pull request #6736 from whymarrh/unused-depsWhymarrh Whitby2019-06-251-22/+1
|\ | | | | Remove unused dependencies
| * Uninstall unused jshint-stylishWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused promptWhymarrh Whitby2019-06-211-1/+0
| |
| * Sort deps correctlyWhymarrh Whitby2019-06-211-1/+1
| |
| * Uninstall unused react-addons-test-utils & react-testutils-additionsWhymarrh Whitby2019-06-211-2/+0
| |
| * Uninstall unused sandwich-expando, semaphore, semver, & shallow-copyWhymarrh Whitby2019-06-211-4/+0
| |
| * Uninstall unused react-markdown dependencyWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused pumpifyWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused pojo-migratorWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused multiplexWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused fast-levenshteinWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused lodash.uniqbyWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused eth-hd-keyringWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused lodash.memoizeWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused hatWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused identicon.jsWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused extension-link-enablerWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused eth-bin-to-opsWhymarrh Whitby2019-06-211-1/+0
| |
| * Uninstall unused ensnareWhymarrh Whitby2019-06-211-1/+0
| |
* | Fix 'watch' npm scriptMark Stacey2019-06-251-1/+1
|/ | | | | | | | | | | | | The `watch` npm script did not work - it must have gone unused for some time. The following changes were required for it to work: * Use the `--watch` flag, rather than the `watch` command (which appears to not exist) * Set the `METAMASK_ENV` environment variable to "test" * Include the tests in the `ui` directory * require the `test/setup.js` file before running the tests The reporter was also changed to `min`, which is generally recommended for use with the `--watch` flag.
* 4byte fallback (#6551)Whymarrh Whitby2019-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds 4byte registry fallback to getMethodData() (#6435) * Adds fetchWithCache to guard against unnecessary API calls * Add custom fetch wrapper with abort on timeout * Use opts and cacheRefreshTime in fetch-with-cache util * Use custom fetch wrapper with timeout for fetch-with-cache * Improve contract method data fetching (#6623) * Remove async call from getTransactionActionKey() * Stop blocking confirm screen rendering on method data loading, and base screen route on transactionCategory * Remove use of withMethodData, fix use of knownMethodData, in relation to transaction-list-item.component * Load data contract method data progressively, making it non-blocking; requires simplifying conf-tx-base lifecycle logic. * Allow editing of gas price while loading on the confirm screen. * Fix transactionAction component and its unit tests. * Fix confirm transaction components for cases of route transitions within metamask. * Only call toString on id if truthy in getNavigateTxData() * Fix knownMethodData retrieval and data fetching from fourbyte
* pin ethereumjs-tx (#6706)Thomas Huang2019-06-111-1/+1
|
* Successful `npm audit' with all required pkgsWhymarrh Whitby2019-06-071-0/+1
|
* npm audit: Works with gaba but w/o ganache-coreWhymarrh Whitby2019-06-071-1/+1
|
* npm audit: Break karma, 1 less low, 1 less highWhymarrh Whitby2019-06-071-1/+1
|
* npm audit: Use eth-json-rpc-infura@3Whymarrh Whitby2019-06-071-1/+1
|
* Move eth-json-rpc-middleware into prod dependenciesWhymarrh Whitby2019-06-071-1/+1
|
* Break Storybook-related pkgs to reduce listed vulnerabilitiesWhymarrh Whitby2019-06-071-3/+3
|
* npm audit fixWhymarrh Whitby2019-06-071-11/+11
|
* npm audit: Works with eth-trezor-keyringWhymarrh Whitby2019-06-071-0/+1
|
* npm audit: Works with eth-ledger-bridge-keyringWhymarrh Whitby2019-06-071-0/+1
|
* npm audit: Works with eth-json-rpc-middlewareWhymarrh Whitby2019-06-071-0/+1
|
* npm audit: Works with eth-json-rpc-filtersWhymarrh Whitby2019-06-071-0/+1
|
* npm audit: Works with eth-json-rpc-infuraWhymarrh Whitby2019-06-071-0/+1
|
* Add ethereumjs-tx dependency backWhymarrh Whitby2019-06-071-0/+1
|
* Successful `npm audit' run w/o some packagesWhymarrh Whitby2019-06-071-7/+0
| | | | | | | | | | | | | | | The following packages have been removed as I work to figure out what is causing npm audit to produce errors: eth-json-rpc-filters eth-json-rpc-infura eth-json-rpc-middleware eth-ledger-bridge-keyring eth-trezor-keyring ethereumjs-tx gaba These packages will slowly be added back in forthcoming commits.
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-011-1/+1
|
* mergepldespaigne2019-05-311-5/+12
|\
| * transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-211-0/+1
| |
| * feature: integrate gaba/PhishingControllerbitpshr2019-05-091-1/+1
| |
| * Auto logout after specific time (#6558)Chi Kei Chan2019-05-091-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-metadataThomas2019-05-091-2/+2
| |
| * Allow dragging seed phrase during Confirm Seed Phrase (#6557)Chi Kei Chan2019-05-071-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 Miller2019-05-061-0/+2
| |
| * Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-041-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 Miller2019-04-181-1/+1
| |
| * Adds e2e test for most web3 methods that dapps use (#6160)Sneh Koul2019-04-171-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 metadataEsteban Mino2019-04-131-1/+1
| |
| * pin eth-contract-metadata to last commit hash (#6396)Esteban Miño2019-04-051-1/+1
| |
* | update packagepldespaigne2019-05-301-1/+1
| |
* | update content-hashpldespaigne2019-05-051-1/+1
| |
* | issue#5742pldespaigne2019-04-041-0/+1
|/
* bump ledger and trezor keyring (#6395)Bruno Barbieri2019-04-041-2/+2
|
* ci: Add build:test Gulp task for e2e buildWhymarrh Whitby2019-03-291-0/+1
|
* Use webRequest to cancel all requests to infura in e2e tests.Dan Miller2019-03-291-0/+1
|
* Bump gaba version to avoid broken eth-contract-metadataWhymarrh Whitby2019-03-211-1/+1
|
* Add rollback script, move auto-changelog script (#6252)Dan Finlay2019-03-201-1/+2
|
* build - babel - move config to babelrc (#6284)kumavis2019-03-121-23/+1
|
* mascara - remove from project (#6283)kumavis2019-03-121-16/+1
|
* npm i -D ganache-core@2.5.3Whymarrh Whitby2019-03-121-1/+1
|
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-0/+1
| | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* bump trezor-connect to v7 (#6224)Bruno Barbieri2019-03-051-1/+1
|
* Merge pull request #6190 from whymarrh/tmp.RvdXXs4ikumavis2019-02-261-1/+0
|\ | | | | Remove public property from package.json file
| * Remove public property from package.json fileWhymarrh Whitby2019-02-211-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 Finlay2019-02-261-1/+2
| |
* | Remove unused CI jobs, rename e2e beta jobsWhymarrh Whitby2019-02-211-6/+2
|/
* Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-141-1/+1
| | | Update changelog file
* fix asset detection (#6049)Bruno Barbieri2019-01-231-0/+1
|
* Fix displayed time and date in the activity log. Remove vreme library, add ↵Alexander Tseung2018-12-141-2/+2
| | | | luxon library. (#5932)
* 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
| | | | |/ / / | | | |/| | |