aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* refactor & change html pagespldespaigne2019-05-055-154/+11
|
* add rinkeby & goerlipldespaigne2019-05-051-0/+6
|
* issue#5742pldespaigne2019-04-043-26/+42
|
* renaming registrar into registrypldespaigne2019-04-042-8/+8
|
* Remove NoticeController (#6382)Thomas Huang2019-04-025-129/+34
|
* Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1Thomas Huang2019-03-301-1/+1
|\ | | | | Version 6.3.1
| * Version 6.3.1Dan Miller2019-03-301-1/+1
| |
* | About tab copy changes; Update route for Info & Help in account menu (#6356)Chi Kei Chan2019-03-301-0/+6
|/
* Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-testsWhymarrh Whitby2019-03-291-2/+10
|\ | | | | Prevent infura requests in e2e tests
| * Default to localhost network when running e2e testsDan Miller2019-03-291-2/+10
| |
* | Merge pull request #6328 from MetaMask/clearNoticeskumavis2019-03-293-3/+25
|\ \ | | | | | | Clear notices
| * | notice-controller - make markAllNoticesRead synckumavis2019-03-291-1/+1
| | |
| * | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-291-3/+12
| | |
| * | notices - markAllNoticesRead - use async/awaitkumavis2019-03-292-15/+10
| | |
| * | Merge branch 'develop' into clearNoticeskumavis2019-03-299-7/+83
| |\|
| * | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-212-0/+18
| | |
* | | buy-eth-url - lint fixkumavis2019-03-291-1/+1
| | |
* | | buy-eth-url - fix variable namekumavis2019-03-291-2/+2
| | |
* | | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension ↵kumavis2019-03-2923-15/+217
|\ \ \ | |_|/ |/| | | | | into vimalsagar-develop
| * | getBuyEthUrl - getDefaultServiceForNetwork then switch on servicekumavis2019-03-291-23/+29
| | |
| * | PR 5575 review comment fixesVimal2019-02-281-23/+24
| | |
| * | merging upstream branchVimal2018-11-1257-1865/+5523
| |\ \
| * | | Adding CoinSwitch exchangeVimal2018-10-2223-0/+193
| | | |
* | | | Version 6.3.0 (#6350)v6.3.0Dan J Miller2019-03-271-1/+1
| | | |
* | | | enable privacy mode for first time users (#6347)Thomas Huang2019-03-261-1/+3
| | | |
* | | | Cancel error rebased (#6341)Dan J Miller2019-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check balance before showing cancel * Fix linter * Use existing helper methods for calculating increased cancel price * Add tooltip for disabled button * Lint fix for cancelError branch. * Disabling of cancel button should account for value of tx.
* | | | New settings page rebased (#6333)Dan J Miller2019-03-262-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New setting tab * Add InfoTab * Add Advanced tab * Add Security Tab * Finish mobile view * Make new setting page responsive * Fix linter * Fix y scrolling * Update link in network dropdown * Fix e2e tests * Remove duplicate translation key * Resolve merge conflict * Only change settings header in popup view. * Place mobile-sync button in advanced-tab of settings
* | | | Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-223-1/+19
| | | |
* | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300)Dan J Miller2019-03-221-0/+3
| | | | | | | | | | | | Add missing translations in gas customization modal
* | | | Folder restructure (#6304)Chi Kei Chan2019-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove ui/app/keychains/ * Remove ui/app/img/ (unused images) * Move conversion-util to helpers/utils/ * Move token-util to helpers/utils/ * Move /helpers/*.js inside /helpers/utils/ * Move util tests inside /helpers/utils/ * Renameand move confirm-transaction/util.js to helpers/utils/ * Move higher-order-components to helpers/higher-order-components/ * Move infura-conversion.json to helpers/constants/ * Move all utility functions to helpers/utils/ * Move pages directory to top-level * Move all constants to helpers/constants/ * Move metametrics inside helpers/ * Move app and root inside pages/ * Move routes inside helpers/ * Re-organize ducks/ * Move reducers to ducks/ * Move selectors inside selectors/ * Move test out of test folder * Move action, reducer, store inside store/ * Move ui components inside ui/ * Move UI components inside ui/ * Move connected components inside components/app/ * Move i18n-helper inside helpers/ * Fix unit tests * Fix unit test * Move pages components * Rename routes component * Move reducers to ducks/index * Fix bad path in unit test
* | | | Stop reloading dapps on network change allowing dapps to decide if it should ↵Josh Stevens2019-03-222-0/+8
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh or not (#6330) * feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not * feat: check the `autoRefreshOnNetworkChange` before a refresh * fix linting error * fix: use `window.ethereum` now `web3.ethereum`
* | | Fix typos in English messages (#6317)Thomas Huang2019-03-191-2/+2
| | |
* | | Fixes popups not showing when screen size is odd (#6312)William Monti Souza2019-03-181-2/+2
| | |
* | | Centre the notification in the current window (#6307)Whymarrh Whitby2019-03-151-4/+3
| | |
* | | Patch/bump version (#6294)v6.2.2Thomas Huang2019-03-131-1/+1
| | |
* | | Merge pull request #6271 from whymarrh/centre-notificatonskumavis2019-03-121-5/+10
|\ \ \ | | | | | | | | Centre all notification popups
| * | | Centre all notification popupsWhymarrh Whitby2019-03-121-5/+10
| | | |
* | | | Improve Korean translations (#6268)bowbowbow2019-03-121-29/+350
|/ / /
* | | mascara - remove from project (#6283)kumavis2019-03-121-1/+0
| | |
* | | GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-123-109/+8
| | | | | | | | | | | | | | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* | | Merge pull request #6279 from MetaMask/notification-windowThomas Huang2019-03-121-1/+1
|\ \ \ | | | | | | | | Nonmultiple notifications for batch txs
| * | | Nonmultiple notifications for batch txsThomas Huang2019-03-121-1/+1
| | | |
* | | | Version 6.2.1 (#6251)Thomas Huang2019-03-121-1/+1
| | | |
* | | | Uppercase and context fixes on Spanish translation.Pedro Gutiérrez2019-03-071-18/+18
|/ / /
* | | Version 6.2.0 (#6239)v6.2.0Dan J Miller2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | * Version 6.2.0 RC1 * Update changelog.md for 6.2.0
* | | Fix typoThomas Huang2019-03-061-1/+1
| | |
* | | Metametrics (#6171)Dan J Miller2019-03-054-4/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add metametrics provider and util. * Add backend api and state for participating in metametrics. * Add frontend action for participating in metametrics. * Add metametrics opt-in screen. * Add metametrics events to first time flow. * Add metametrics events for route changes * Add metametrics events for send and confirm screens * Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen * Ensures each log in is measured as a new visit by metametrics. * Ensure metametrics is called with an empty string for dimensions params if specified * Adds opt in metametrics modal after unlock for existing users * Adds settings page toggle for opting in and out of MetaMetrics * Switch metametrics dimensions to page level scope * Lint, test and translation fixes for metametrics. * Update design for metametrics opt-in screen * Complete responsive styling of metametrics-opt-in modal * Use new chart image on metrics opt in screens * Incorporate the metametrics opt-in screen into the new onboarding flow * Update e2e tests to accomodate metametrics changes * Mock out metametrics network requests in integration tests * Fix tx-list integration test to support metametrics provider. * Send number of tokens and accounts data with every metametrics event. * Update metametrics event descriptor schema and add new events. * Fix import tos bug and send gas button bug due to metametrics changes. * Various small fixes on the metametrics branch. * Add origin custom variable type to metametrics.util * Fix names of onboarding complete actions (metametrics). * Fix names of Metrics Options actions (metametrics). * Clean up code related to metametrics. * Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base * Don't send a second metrics event if user has gone back during first time flow. * Collect metametrics on going back from onboarding create/import. * Add missing custom variable constants for metametrics * Fix metametrics provider * Make height of opt-in modal responsive. * Adjust text content for opt-in modal. * Update metametrics event names and clean up code in opt-in-modal * Put phishing warning step next to last in onboarding flow * Link terms of service on create and import screens of first time flow * Add subtext to options on the onboarding select action screen. * Fix styling of bullet points on end of onboarding screen. * Combine phishing warning and congratulations screens. * Fix placement of users if unlocking after an incomplete onboarding import flow. * Fix capitalization in opt-in screen * Fix last onboarding screen translations * Add link to 'Learn More' on the last screen of onboarding * Code clean up: metametrics branch * Update e2e tests for phishing warning step removal * e2e tests passing on metametrics branch * Different tracking urls for metametrics on development and prod
* | | SimplifyThomas Huang2019-03-051-1/+1
| | |
* | | ImprovementThomas Huang2019-03-011-1/+1
| | |
* | | Show popup if notification or activeMMtab is true but not if popup is openThomas Huang2019-03-011-1/+1
| | |
* | | First time flow updates (#6192)Dan J Miller2019-02-274-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Action select step of onboarding flow added. * Update navigation on create and import password screens. * Adds terms of service checkbox to create and import account screens. * Add security warning to jazzicon intro step * Update and streamline unique image to confirm seed steps of first time flow. * UI touch ups to welcome screen. * UI touch up on select action page * Fix first time import flow. * Add end of flow screen to first time flow * Replace unique image screen with updated fishing warning screen. * Update e2e tests for onboarding flow changes. * Add required translations to onboarding flow. * Update design of select action screen to emphasize create new wallet option. * Clean up onboarding flow code. * Remove notice related code from first-time-flow directory. * Use updater function argument in new-account.component
* | | Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-271-0/+6
| | |
* | | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-263-1/+97
| | |
* | | account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-213-3/+70
| | | | | | | | | | | | | | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails
* | | EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-209-23/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EIP-1193: Implement new provider API * EIP-1193: Updated implementation * Remove test file * Fix tests * Update ping check * Update logic * PR feedback
* | | Merge pull request #6183 from chikeichan/5171Dan J Miller2019-02-201-1/+1
|\ \ \ | | | | | | | | Bring Popup to front when ui is tiggered
| * | | Bring Popup to front when ui is tiggeredChi Kei Chan2019-02-191-1/+1
| | | |
* | | | Version 6.1.0 RC1Dan Finlay2019-02-201-1/+1
| | | |
* | | | Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-201-0/+3
|/ / /
* | | Fix inpage.js event handler memory leak (#6177)Graham Kaemmer2019-02-191-4/+5
| | | | | | | | | Fixes #6176
* | | Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-171-0/+6
| | | | | | | | | | | | | | | | | | * Add Copy Tx ID button to transaction-list-item-details * Move justCopied toggle timeout inside setState callback
* | | Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-148-32/+32
|\ \ \ | | | | | | | | Sprinkle ES6 onto background files
| * | | Update popup-core script to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-6/+6
| | | |
| * | | Update platforms/extension to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| | | |
| * | | Update phishing-detect script to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| | | |
| * | | Update NoticesController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-3/+3
| | | |
| * | | Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| | | |
| * | | Fix all "var used instead of let or const" problems in inpage.jsWhymarrh Whitby2019-02-121-4/+4
| | | |
| * | | Update contentscript to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| | | |
| * | | Fix all "var used instead of let or const" problems in background.jsWhymarrh Whitby2019-02-121-7/+7
| | | |
* | | | Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-142-0/+6
| | | | | | | | | | | | Update changelog file
* | | | Merge pull request #6124 from MetaMask/dissable-recent-block-controllerThomas Huang2019-02-133-4/+30
|\ \ \ \ | | | | | | | | | | recent-blocks - dont listen for block when on infura providers
| * | | | fix typofrankiebee2019-02-131-4/+4
| | | | |
| * | | | recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-123-4/+30
| | | | |
* | | | | Version 6.0.1 (#6141)v6.0.1Whymarrh Whitby2019-02-131-1/+1
| |/ / / |/| | |
* | | | Update Italian translation (#6119)matteopey2019-02-121-40/+277
| | | |
* | | | Improved Traditional Chinese translation (#6125)S.C. Chen2019-02-121-102/+735
| | | |
* | | | Version 6 RC1 (#6117)Dan Finlay2019-02-121-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | * Version 6 RC1 * Make gas input feature more readable * Update CHANGELOG.md with additional 6.0.0 changes
* | | Fix locale codes contains underscore will never be preferred (#6116)S.C. Chen2019-02-091-4/+11
| | |
* | | Add Swap feature to CurrencyInput (#6091)Chi Kei Chan2019-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Add Swap feature to CurrencyInput * Fix linter error * Fix and Add unit tests
* | | Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extract advanced gas input controls to their own component * Add advanced inline gas toggle to settings * Add optional advanced inline gas to send send screen * Adds optional advanced gas inputs to the confirm screen * Add info modals for advanced gas inputs. * Fix translation of advance gas toggle description. * Lint and unit test fixes for inline-advanced-gas-inputs * Increase margin above advanced options button on send screen * Move methods from constructor to property syntax in advanced-gas-inputs.component
* | | Update design of phishing warning screenWhymarrh Whitby2019-02-063-77/+465
| | |
* | | Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-053-1/+5
| | |
* | | Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-052-4/+39
| | |
* | | Default to the new UI for all usersWhymarrh Whitby2019-02-051-20/+2
| | |
* | | Version 5.3.5 (#6109)v5.3.5Whymarrh Whitby2019-02-051-1/+1
| | |
* | | Privacy mode fixes (#6087)Bruno Barbieri2019-02-021-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Version 5.3.4 RC1 * fix old ui approval screen * fix error caused by meshtesting iframe * fix linter errors
* | | Version 5.3.4 RC1 (#6084)Dan Finlay2019-02-011-1/+1
| | |
* | | fix - migration 30 undefinds (#6079)Frankie2019-02-011-16/+18
| | |
* | | Version 5.3.3 RC1v5.3.3Dan Finlay2019-01-311-1/+1
| | |
* | | EIP-1102 updates (#6006)Paul Bouchon2019-01-312-24/+28
| | | | | | | | | | | | | | | | | | * Update privacy notice * Respond to 1102 messages using tab ID
* | | Improved Spanish translations (#6072)Pedro Gutiérrez2019-01-311-13/+13
| | |
* | | Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-301-0/+3
| | |
* | | I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-302-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mm-controller - dont overwrite existing rpc settings * ui-networkDropdown - dont pass old network as chainId * add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc * use updateAndSetCustomRpc in settings to allow rpcs to be updated * use new rpc as nickname if no nick name has been supplied * fix update rpc method
* | | Version 5.3.2 RC1 (#6069)Dan Finlay2019-01-291-1/+1
| | |
* | | add source for header in create infura client (#6023)Jenny Pollack2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | * add source for header in create infura client * bump eth-json-rpc-infura
* | | Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-236-2/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state * Fix linting and tests * Fix translations, initialization notice routing * Fix drizzle tests * Fix e2e tests * Fix integration tests * Fix styling * Fix migration naming from 030 to 031 * Open extension in browser when user has not completed onboarding
* | | Updated Spanish translations (#6046)oliver renwick2019-01-231-3/+577
| | | | | | | | | | | | | | | | | | | | | * up to E's in translation, starting from about 60% incomplete * Spanish at 100% * Integrating changes as suggested by fernandomg * with updates from Herman and Esteban.
* | | Prevent send to token (#6051)Esteban Miño2019-01-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * check contact metadata * check for tokens in state * tests * update tests * validation only if sending tokens * container test
* | | fix asset detection (#6049)Bruno Barbieri2019-01-231-2/+18
| | |
* | | Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-232-0/+15
| | | | | | | | | | | | | | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response
* | | I#5956 fix 1 (#6026)Frankie2019-01-183-1/+53
| | | | | | | | | | | | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs
* | | Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-171-2/+2
| | |
* | | Version 5.3.1 RC2Dan Finlay2019-01-171-1/+1
| | |
* | | Merge pull request #5966 from filips123/patch-1Thomas Huang2019-01-111-3/+180
|\ \ \ | | | | | | | | Update Slovenian translation
| * \ \ Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵Filip Š2019-01-106-10/+14
| |\ \ \ | | | | | | | | | | | | | | | into patch-1
| * | | | Update Slovenian translationFilip Š2018-12-261-3/+180
| | | | |
* | | | | Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
| |/ / / |/| | |
* | | | Refine app descriptionDan Finlay2019-01-061-1/+1
| | | | | | | | | | | | Should help SEO on the chrome store.
* | | | Wrong french translationWathis2019-01-041-6/+6
| | | | | | | | | | | | Changing "Connection" by "Connexion"
* | | | Merge pull request #5987 from MetaMask/Version-5.3.0Thomas Huang2019-01-041-1/+1
|\ \ \ \ | | | | | | | | | | Version 5.3.0 RC1
| * | | | Version 5.3.0 RC1v5.3.0Dan Finlay2019-01-031-1/+1
| | | | |
* | | | | Merge pull request #5992 from MetaMask/i5140-accountsThomas Huang2019-01-041-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Add scrolling button to account list
| * | | | | Add scrolling button to account listAlexander Tseung2019-01-041-0/+4
| |/ / / /
* / / / / fix typo in phishing.html titlePaul Chonpimai2019-01-031-1/+1
|/ / / /
* | | | fix extension linkbrunobar792019-01-031-1/+1
| | | |
* | | | Fix etherscan links on notificationsBruno Barbieri2018-12-291-1/+1
|/ / /
* | | Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-1/+3
| | | | | | | | | | | | | | | | | | * transactions - throw an error if a transaction is generated while the network is loading * add tests for failing when netId is loading
* | | Merge pull request #5893 from MetaMask/loading-network-screenDan J Miller2018-12-141-0/+9
|\ \ \ | | | | | | | | Loading network screen
| * | | Clean up for the loading-network-screenDan Miller2018-12-131-0/+6
| | | |
| * | | Add identifier of private network to the network loading screen message.Dan Miller2018-12-131-0/+3
| | | |
* | | | Version 5.2.2 RC1v5.2.2Dan Finlay2018-12-131-1/+1
|/ / /
* | | Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-131-0/+30
|\ \ \ | | | | | | | | Fix some styling and translations in the gas customization modal
| * | | Add missing translation to the gas customization component.Dan Miller2018-12-131-0/+30
| | | |
* | | | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-131-1/+1
|/ / /
* | | Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-121-1/+1
|\ \ \ | | | | | | | | Fix provider crashes
| * | | Changelog and version bump for 5.2.0Dan Miller2018-12-121-1/+1
| | | |
* | | | Show Failed transaction in the browser notification for on-chain failures ↵Alexander Tseung2018-12-111-4/+7
|/ / / | | | | | | | | | (#5904)
* | | Group transactions by nonce (#5886)Alexander Tseung2018-12-1010-16/+65
| | |
* | | Merge pull request #5892 from MetaMask/fix-net-version-race-conditionThomas Huang2018-12-081-4/+10
|\ \ \ | | | | | | | | Fix race condition in network controller lookup() method.
| * | | Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
| | | |
* | | | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
|/ / /
* | | Fix "fastest" translation message; change to sentence caseDan Miller2018-12-041-1/+1
| | |
* | | Adds createSpeedUpTransaction to txControllerDan Miller2018-12-042-0/+30
| | |
* | | Redesign of gas customization basic tab.Dan Miller2018-12-041-0/+3
| | |
* | | Clean up for advanced gas tab customization changes.Dan Miller2018-12-041-0/+3
| | |
* | | Test updates and additions for button integration with send screen.Dan Miller2018-12-041-0/+3
| | |
* | | Integrate gas buttons with the send screen.Dan Miller2018-12-041-0/+12
| | |
* | | Split advanced-tab-content.component.js render() method into smaller ↵Dan Miller2018-12-041-0/+12
| | | | | | | | | | | | pieces; add translations to the same file.
* | | Adds the content of the advanced tab - w/o chart or dynamic content - to gas ↵Dan Miller2018-12-041-0/+6
| | | | | | | | | | | | customize modal.
* | | Adds new gas customization modal container (without content)Dan Miller2018-12-041-0/+18
| | |
* | | Version 5.1.0: East BayDan Finlay2018-12-041-1/+1
| | |
* | | Update phishing warning copyDan Finlay2018-12-041-5/+4
| | | | | | | | | | | | Per advice of legal counsel.
* | | Hide link for phishing-detect page (#5864)Michael - Blurpesec2018-12-021-1/+1
| | | | | | | | | | | | | | | | | | * Soften language on phishing-detect page * remove quotes
* | | fix visibilityBruno Barbieri2018-12-011-1/+0
| | |
* | | Save recent network balances in local storage (#5843)Dan J Miller2018-12-012-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use selector for state.metamask.accounts in all cases. * Default to cached balance when selecting metamask accounts * Adds the cached-balances controller * Documentation and small codes fixes for #5843 Co-Authored-By: danjm <danjm.com@gmail.com>
* | | bugfix: normalize contract addresss when fetching exchange rates (#5863)Paul Bouchon2018-12-011-1/+3
| | |
* | | Fixed Vivek's bug (#5860)Dan Finlay2018-11-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed Vivek's bug Fixes #5850 What was happening: It seems that his MetaMask had crashed while some new transactions had been loading defaults. He probably had a network connectivity issue to Infura (which we are working with Infura to address). As a result of this network cutout, his three unapproved transactions were not marked failed, and were not marked as `loadingDefaults = false`, as their gas prices had not yet been estimated. Normally this behavior is supposed to clean itself up when the transaction controller starts up, via the `TransactionController._onBootCleanUp()` function, but in this case, during unlock, that function was unable to do its job because when it requested the transaction list, the current network was in the `loading` state, making it proceed as if there were no pending transactions. To fix this, I am doing two things: - Setting transactions to loadingDefaults = false in more catch blocks. - Calling `onBootCleanUp()` when the network store's status changes, so that it will re-trigger when loading completes. * Fixed reference * Fixed infinite loop bug Was refreshing the tx list on every tx state change instead of just network changes, creating an infinite loop. * Add notes to tx updates to clarify logs
* | | Version 5.0.4 RC1 (#5859)v5.0.4Dan Finlay2018-11-301-2/+2
| | |
* | | transactions/tx-gas-utils - add the acctual response for eth_getCode for ↵Frankie2018-11-301-0/+9
| | | | | | | | | | | | NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840)
* | | Merge pull request #5848 from MetaMask/Less-Certain-LanguageWhymarrh Whitby2018-11-291-1/+1
|\ \ \ | | | | | | | | Soften accusatory language on phishing warning
| * | | Soften accusatory language on phishing warningDan Finlay2018-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We don't always know for sure that sites marked as phishers are defiitely scams, and so we should avoid language that makes concrete accusations.
* | | | Open full-screen UI on installWhymarrh Whitby2018-11-271-5/+4
| | | |
* | | | Revert "Don't open MetaMask website after install"Whymarrh Whitby2018-11-271-0/+9
|/ / /
* | | Autofill gasPrice for retry attempts with either the recommended gasprice or ↵Frankie2018-11-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | a %10 bump (#5786) * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump * lint
* | | transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
| | |
* | | Merge pull request #5792 from MetaMask/signed-type-data-error-hw-walletBruno Barbieri2018-11-271-9/+16
|\ \ \ | | | | | | | | Consider HW Wallets for signTypedMessage
| * | | Use Array.includesBruno Barbieri2018-11-271-4/+4
| | | |
| * | | remove extra semicolonbrunobar792018-11-211-1/+1
| | | |
| * | | consider hw walletsbrunobar792018-11-211-9/+16
| | | |
* | | | Show Connect Requests count in extension badgeWhymarrh Whitby2018-11-261-1/+3
| | | |
* | | | Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
| | | |
* | | | Increase Token Symbol length to twelveThomas Huang2018-11-2320-42/+42
| | | |
* | | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-225-1/+121
|\ \ \ \ | | | | | | | | | | Add Firefox and Brave support for Trezor
| * | | | trezor v6brunobar792018-11-211-2/+2
| | | | |
| * | | | fix merge conflictsbrunobar792018-11-2115-24/+97
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-2/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-151-0/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1416-418/+1816
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-11-0749-1798/+3537
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-2110-55/+1373
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ fix conflictsbrunobar792018-10-1750-1813/+4512
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-0615-160/+941
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add port names blacklistbrunobar792018-08-231-0/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | handle onDisconnectbrunobar792018-08-231-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix merge conflictsbrunobar792018-08-239-281/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-221-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-08-2145-493/+856
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | undo permission changebrunobar792018-08-111-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fixesbrunobar792018-08-103-6773/+37
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | use new connect.js filebrunobar792018-08-101-9468/+1240
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-105-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-096-18/+125
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | clean upbrunobar792018-08-053-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | trezor v5 working on firefoxbrunobar792018-08-055-1/+15078
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switchWhymarrh Whitby2018-11-2224-162/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | Default to the new UI for first time users
| * | | | | | | | | | | | | | | | Remove "Beta" from welcome messagesWhymarrh Whitby2018-11-2120-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More sed magic: sed -i.bak 's/MetaMask Beta/MetaMask/' app/_locales/**/messages.json && \ find app/_locales -name '*.bak' -delete sed -i.bak 's/"welcomeBeta"/"welcome"/' app/_locales/**/messages.json && \ find app/_locales -name '*.bak' -delete
| * | | | | | | | | | | | | | | | Don't announce new UI to users switching backWhymarrh Whitby2018-11-211-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove "Beta" from header logoWhymarrh Whitby2018-11-212-115/+62
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Default to the new UI for first time usersWhymarrh Whitby2018-11-212-14/+7
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | 1102: Push publicConfigStore to next turn to avoid race conditiono (#5777)Paul Bouchon2018-11-181-2/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765)Dan Finlay2018-11-173-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Auto fail transactions that have been approved for over 12 hours Converts txs using a migration. This migration uses a new helper function that generates tx-failing migrations, and only requires a version, error message, and condition to run on each transaction. * Linted * Only migrate approved txs to failed * Cleanup * Cleanup * Small lint fixes
* | | | | | | | | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-179-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors
* | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-173-3/+3
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | | | | Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-153-2/+22
| |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add beginning of test * Resubmit approved transactions on new block May fix #4343 and related issues, where an error could leave transactions stranded in the approved state. * Remove unused test * Re-approve transactions when retrying approved * Add retry approved test * Include approved in pending tx count * Fix getPendingTxs() * Linted * Only throw hash error in submitted state * Only check submitted txs for block inclusion * Fix test expectations
* | | | | | | | | | | | | 1102: use meta title if it exists before titlePaul Bouchon2018-11-151-0/+5
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Update Balanc3 API (#5744)Paul Bouchon2018-11-142-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* | | | | | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-144-0/+30
| | | | | | | | | | | |
* | | | | | | | | | | | Slovenian and slovak fixes (#5730)Filip Š2018-11-133-330/+1703
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix Slovenian translation * Add Slovak translation
* | | | | | | | | | | Version 5.0.2v5Dan Finlay2018-11-101-1/+1
| | | | | | | | | | |
* | | | | | | | | | | EIP-1102: Update publicConfig store concurrently with approvalPaul Bouchon2018-11-103-33/+29
| | | | | | | | | | |
* | | | | | | | | | | 1102: Fix inpage listener syntax (#5708) (#5709)Noah I2018-11-091-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Version 5.0.1 (#5694)Dan Finlay2018-11-081-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundleDan J Miller2018-11-083-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bundle some ui dependencies separately to limit the build size of ui.js
| * | | | | | | | | | | Bundle some ui dependencies separately to limit the build size of ui.jsDan Miller2018-11-013-0/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Cleanupbitpshr2018-11-081-18/+10
| | | | | | | | | | | |
* | | | | | | | | | | | 1102: use postMessage instead of injected scripts to bypass CSPbitpshr2018-11-081-17/+13
| | | | | | | | | | | |
* | | | | | | | | | | | wipbitpshr2018-11-082-24/+39
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Fix lint errorsbitpshr2018-11-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Remove injected script tags after usebitpshr2018-11-071-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Clear cached approval after rejectionbitpshr2018-11-072-8/+11
| | | | | | | | | | |
* | | | | | | | | | | Version 5.0.0 (#5685)Dan Finlay2018-11-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Move experimental provider augmentationbitpshr2018-11-061-13/+13
| | | | | | | | | | |
* | | | | | | | | | | Add experimental RPC method supportbitpshr2018-11-063-6/+20
| | | | | | | | | | |
* | | | | | | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-065-24/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Parameterize NetworkDisplay background colour * Update design for login request screen * Pass siteTitle, siteImage through for calls to ethereum.enable() * Bring the site images closer together
* | | | | | | | | | | Do not modify isApproved when lockedbitpshr2018-11-061-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Mark origins as unapproved if user explicitly locks MetaMaskbitpshr2018-11-062-3/+5
| | | | | | | | | | |
* | | | | | | | | | | Enable cachingPaul Bouchon2018-11-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | isApproved should return falsebitpshr2018-11-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Remove internal listenersbitpshr2018-11-061-6/+15
| | | | | | | | | | |
* | | | | | | | | | | rebasebitpshr2018-11-061-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Disable approval cachingbitpshr2018-11-064-6/+34
| | | | | | | | | | |
* | | | | | | | | | | Differentiate locked and enabledbitpshr2018-11-064-27/+10
| | | | | | | | | | |
* | | | | | | | | | | Code bathbitpshr2018-11-064-33/+49
| | | | | | | | | | |
* | | | | | | | | | | Handle logout gracefullybitpshr2018-11-064-25/+42
| | | | | | | | | | |
* | | | | | | | | | | Fix lint issuesbitpshr2018-11-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Only filter selectedAddress from publicConfig storebitpshr2018-11-061-6/+10
| | | | | | | | | | |
* | | | | | | | | | | Fix race condition with publicConfigStorebitpshr2018-11-061-5/+24
| | | | | | | | | | |
* | | | | | | | | | | Move convenience methods to _metamask namespacebitpshr2018-11-061-28/+55
| | | | | | | | | | |
* | | | | | | | | | | Fix lint issuesbitpshr2018-11-061-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Add isUnlocked provider hookbitpshr2018-11-064-3/+29
| | | | | | | | | | |
* | | | | | | | | | | Differentiate isEnabled and isApproved hookbitpshr2018-11-061-3/+12
| | | | | | | | | | |
* | | | | | | | | | | Update isEnabled checkbitpshr2018-11-061-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Remove duplicate i18n keysbitpshr2018-11-062-9/+0
| | | | | | | | | | |
* | | | | | | | | | | EIP-1102: add user privacy optionbitpshr2018-11-0624-53/+188
| | | | | | | | | | |
* | | | | | | | | | | EIP-1102: add isEnabled convenience method to providerbitpshr2018-11-063-9/+53
| | | | | | | | | | |
* | | | | | | | | | | EIP-1102: Add option to force-enable providerbitpshr2018-11-0624-784/+537
| | | | | | | | | | |
* | | | | | | | | | | EIP-1102: updated implementationbitpshr2018-11-0627-28/+784
| | | | | | | | | | |
* | | | | | | | | | | Version 4.17.1Dan Finlay2018-11-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | network - infura - hardcode net_version and eth_chainId (#5670)kumavis2018-11-061-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * network - infura - hardcode net_version and eth_chainId * network - infura - add rinkeby handling * lint fix
* | | | | | | | | | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions
* | | | | | | | | | | Merge pull request #5659 from MetaMask/token-rates-bugfixkumavis2018-11-041-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | token-rates - protect against bad token data
| * | | | | | | | | | | token-rates - protect against bad token datakumavis2018-11-031-4/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Revert "support eth_chainId"Thomas Huang2018-11-041-14/+4
|/ / / / / / / / / / /
* / / / / / / / / / / 4.17.0v4.17.0kumavis2018-11-021-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5560 from MetaMask/sentry-enhancements2kumavis2018-10-307-60/+112
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Sentry - various enhancements to help debugging (alternate)
| * \ \ \ \ \ \ \ \ \ Merge branch 'sentry-enhancements2' of ↵kumavis2018-10-301-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into sentry-enhancements2
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into sentry-enhancements2kumavis2018-10-3017-1526/+2289
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-3018-1552/+2299
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2