aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix typo in phishing.html titlePaul Chonpimai2019-01-031-1/+1
|/ / / /
* | | | Merge pull request #5986 from MetaMask/fix-etherscan-againThomas Huang2019-01-031-1/+1
|\ \ \ \ | | | | | | | | | | Fix notifications link
| * | | | fix extension linkbrunobar792019-01-031-1/+1
|/ / / /
* | | | Merge pull request #5978 from MetaMask/fix-etherscan-link-notificationsBruno Barbieri2019-01-031-1/+1
|\ \ \ \ | | | | | | | | | | Fix etherscan links on notifications
| * \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792019-01-031-3/+3
| |\ \ \ \ | |/ / / / |/| | | | | | | | | fix-etherscan-link-notifications
* | | | | Merge pull request #5980 from MetaMask/fix-drizzle-testsThomas Huang2019-01-031-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Fix drizzle tests
| * | | | remove --unsafe-permBruno Barbieri2019-01-031-1/+1
| | | | |
| * | | | no globalsBruno Barbieri2019-01-031-3/+3
| | | | |
| * | | | Use sudo consistentlyBruno Barbieri2019-01-031-2/+2
| | | | |
| * | | | --unsafe-perm ?Bruno Barbieri2019-01-031-1/+1
| | | | |
| * | | | Dont use sudo to install truffleBruno Barbieri2019-01-011-1/+1
|/ / / /
| * / / Fix etherscan links on notificationsBruno Barbieri2018-12-291-1/+1
|/ / /
* | | Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-1426-464/+1306
| | | | | | | | | | | | | | | | | | * Prevent users from changing the From field in the send screen * Fix integration tests
* | | Fix displayed time and date in the activity log. Remove vreme library, add ↵Alexander Tseung2018-12-147-205/+192
| | | | | | | | | | | | luxon library. (#5932)
* | | Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-142-3/+14
| | | | | | | | | | | | | | | | | | * 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-1415-38/+341
|\ \ \ | | | | | | | | Loading network screen
| * | | Clean up for the loading-network-screenDan Miller2018-12-134-33/+30
| | | |
| * | | Improve styling of loading retry / error screenDan Miller2018-12-131-0/+6
| | | |
| * | | Adds network loading retry / error screen.Dan Miller2018-12-1311-4/+268
| | | |
| * | | Add identifier of private network to the network loading screen message.Dan Miller2018-12-134-7/+23
| | | |
| * | | Add spinner and dropdown arrow to network indicator on custom network loading.Dan Miller2018-12-132-27/+47
| | | |
* | | | Merge pull request #5926 from MetaMask/Version-5.2.2Thomas Huang2018-12-132-1/+7
|\ \ \ \ | | | | | | | | | | Version 5.2.2 RC1
| * | | | Version 5.2.2 RC1v5.2.2Dan Finlay2018-12-132-1/+7
|/ / / /
* | | | Fix speed up button not showing for transactions with the lowest nonce (#5925)Alexander Tseung2018-12-131-3/+3
| | | |
* | | | Merge pull request #5923 from MetaMask/phishing-text-linkThomas Huang2018-12-131-2/+1
|\ \ \ \ | | | | | | | | | | Update the Phishing Warning notice text to not use inline URLs
| * | | | Update the Phishing Warning notice text to not use inline URLsWhymarrh Whitby2018-12-131-2/+1
| |/ / / | | | | | | | | This changeset makes the Phishing Warning text not have a raw link right at the end of a sentence since it could introduce possible copy-and-paste errors.
* / / / Make docs links consistent (#5920)Dan Finlay2018-12-132-22/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | * Make docs links consistent So our various docs pages inter-link consistently per https://github.com/MetaMask/metamask-docs/issues/1 * Add docs links to internal docs page
* | | Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-1310-26/+60
|\ \ \ | | | | | | | | Fix some styling and translations in the gas customization modal
| * | | Show transaction fee instead of total fee in top left of gas customization ↵Dan Miller2018-12-134-9/+9
| | | | | | | | | | | | | | | | modal.
| * | | Fix width of gas customization model in notification viewDan Miller2018-12-132-3/+4
| | | |
| * | | Add missing translation to the gas customization component.Dan Miller2018-12-136-14/+47
| | | |
* | | | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-132-1/+5
|/ / /
* | | Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-txDan J Miller2018-12-126-11/+23
|\ \ \ | | | | | | | | Ensures that advanced tab gas limit reflects tx gas limit
| * | | Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-126-11/+23
|/ / /
* | | Add submitDisabled prop to Modals. Disable submit button when creating a ↵Alexander Tseung2018-12-124-2/+44
| | | | | | | | | | | | cancel transaction (#5910)
* | | Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-124-468/+1057
|\ \ \ | | | | | | | | Fix provider crashes
| * \ \ Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelogThomas Huang2018-12-122-2/+9
| |\ \ \ | | | | | | | | | | Changelog and version bump for 5.2.0
| | * | | Changelog and version bump for 5.2.0Dan Miller2018-12-122-2/+9
| |/ / /
| * | | Merge branch 'develop' into i5846-ProviderCrashesDan Finlay2018-12-1115-68/+395
| |\ \ \
| * | | | Bump package lock, mostly to https linksDan Finlay2018-12-111-465/+1047
| | | | |
| * | | | Bump json-rpc-engine to v4.0.0Dan Finlay2018-12-111-1/+1
| | | | |
* | | | | Show Failed transaction in the browser notification for on-chain failures ↵Alexander Tseung2018-12-111-4/+7
| |/ / / |/| | | | | | | | | | | (#5904)
* | | | Improve ux for low gas price set (#5862)Dan J Miller2018-12-1115-68/+395
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show user warning if they set gas price below safelow minimum, error if 0. * Properly cache basic price estimate data. * Default retry price to recommended price if original price was 0x0 * Use mock fetch in send-new-ui integration tests.
* | | fix formatting of 32-byte strings in personal_sign (#5878)Noah Zinsmeister2018-12-102-1/+2
| | |
* | | Group transactions by nonce (#5886)Alexander Tseung2018-12-1047-373/+1208
| | |
* | | 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
| | | |
* | | | Merge pull request #5890 from whymarrh/pl-i18nWhymarrh Whitby2018-12-081-0/+9
|\ \ \ \ | | | | | | | | | | Fill in more Polish message translations
| * | | | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
| | | | |
* | | | | Merge pull request #5891 from whymarrh/npm-auditWhymarrh Whitby2018-12-075-2552/+2542
|\ \ \ \ \ | |/ / / / |/| | | | Migrate test deps CI job to npm audit
| * | | | Deduplicate package.json fileWhymarrh Whitby2018-12-072-322/+1042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-1262/+1092
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === 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-072-7/+0
| | | | |
| * | | | Remove beefy dependency and its usagesWhymarrh Whitby2018-12-073-504/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-579/+253
| | | | | | | | | | | | | | | | | | | | Refs #4751
| * | | | npm audit fixWhymarrh Whitby2018-12-062-452/+392
| | | | |
| * | | | circleci: Disable npm audit when installing packagesWhymarrh Whitby2018-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auditing packages when installing here doesn't help anyone as the summary isn't visible and vulnerabilities don't produce a non-zero exit code. We will have `npm audit` as an extra CI job.
| * | | | Update lockfile to fix errorsWhymarrh Whitby2018-12-061-11/+334
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | npm has informed me that the lockfile has "errors": npm ERR! code ELOCKVERIFY npm ERR! Errors were found in your package-lock.json, run npm install to fix them. npm ERR! Missing: c3@^0.6.7 npm ERR! Invalid: lock file's d3@3.5.17 does not satisfy d3@^5.7.0
* | | | Merge pull request #5882 from whymarrh/fix-main-container-wrapper-heightWhymarrh Whitby2018-12-061-1/+2
|\ \ \ \ | |/ / / |/| | | Force main container wrapper height to fill remaining space
| * | | Replace height: 100% rule with workaround for flexbox quirksWhymarrh Whitby2018-12-061-1/+2
|/ / /
* | | Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-dDan J Miller2018-12-05104-264/+7147
|\ \ \ | | | | | | | | Gas customization features
| * | | Fix styling of send screen in extension view when hex data on.Dan Miller2018-12-044-12/+17
| | | |
| * | | Final gas customization fixesDan Miller2018-12-0418-104/+198
| | | |
| * | | Clear custom gas data on hiding of gas customization modal.Dan Miller2018-12-041-4/+12
| | | |
| * | | Modify results of API data to better fit gas chart: remove outliers, pad dataDan Miller2018-12-045-44/+126
| | | |
| * | | Add loading spinners when waiting for APIs in the gas customization modalDan Miller2018-12-049-6/+61
| | | |
| * | | Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-0421-140/+309
| | | |
| * | | Fix "fastest" translation message; change to sentence caseDan Miller2018-12-041-1/+1
| | | |
| * | | Improve responsiveness of customize speed up slider.Dan Miller2018-12-043-6/+76
| | | |
| * | | Make gas customization modal responsive.Dan Miller2018-12-047-1/+32
| | | |
| * | | Add c3 and d3 to the separate dependencies bundle.Dan Miller2018-12-041-0/+2
| | | |
| * | | Add gas data to integration test json data set.Dan Miller2018-12-043-3/+633
| | | |
| * | | Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-043-36/+317
| | | |
| * | | Fixes for components that break e2e gas customization tests, plus unit test ↵Dan Miller2018-12-049-21/+102
| | | | | | | | | | | | | | | | updates.
| * | | Update e2e tests for new gas customization modal.Dan Miller2018-12-045-21/+62
| | | |
| * | | Connect gas price chart to gas station api.Dan Miller2018-12-043-41/+204
| | | |
| * | | Adds speed up slide-in gas customization sidebarDan Miller2018-12-0419-58/+306
| | | |
| * | | Adds createSpeedUpTransaction to txControllerDan Miller2018-12-043-0/+97
| | | |
| * | | Redesign of gas customization basic tab.Dan Miller2018-12-048-10/+134
| | | |
| * | | Clean up for mmui-i11-custom-gas-price-chart branchDan Miller2018-12-044-33/+25
| | | |
| * | | Improve data management and tests for gas-modal-page-container price estimates.Dan Miller2018-12-044-20/+67
| | | |
| * | | Update tests, plus some lint fixes, for gas-price-chartDan Miller2018-12-043-53/+204
| | | |
| * | | Clean up gas chart code.Dan Miller2018-12-043-362/+373
| | | |
| * | | Add control arrows to advanced gas tab inputs.Dan Miller2018-12-043-1/+63
| | | |
| * | | Complete integration of gas chart with redux.Dan Miller2018-12-049-14/+148
| | | |
| * | | Read only connection of gas price chart to reduxDan Miller2018-12-0413-28/+245
| | | |
| * | | Gas price chart improvements, redesign, bug fixes, and set up to receive ↵Dan Miller2018-12-045-88/+300
| | | | | | | | | | | | | | | | external data
| * | | Adds not yet functional gas price chart.Dan Miller2018-12-0411-20/+290
| | | |
| * | | Lint and unit test fixes.Dan Miller2018-12-043-5/+4
| | | |
| * | | Clean up for advanced gas tab customization changes.Dan Miller2018-12-043-19/+16
| | | |
| * | | Adds redesign for the customize gas advanced tab.Dan Miller2018-12-0419-152/+332
| | | |
| * | | Test updates and additions for button integration with send screen.Dan Miller2018-12-0419-64/+465
| | | |
| * | | Integrate gas buttons with the send screen.Dan Miller2018-12-0414-41/+301
| | | |
| * | | Connects remained of the gas customization component to redux.Dan Miller2018-12-0422-194/+497
| | | |
| * | | Adds gas-duck.test.js tests.Dan Miller2018-12-041-0/+300
| | | |
| * | | Styling fixes for gas customization advanced tab content.Dan Miller2018-12-044-3/+2
| | | |
| * | | Improvements to propdefaults in button-group.component and ↵Dan Miller2018-12-042-2/+3
| | | | | | | | | | | | | | | | basic-tab-content.component
| * | | Connect the gas-button-group component to redux and a live api.Dan Miller2018-12-0415-111/+573
| | | |
| * | | Adds basic tab content to gas customizer, with styled button group (static, ↵Dan Miller2018-12-0416-15/+615
| | | | | | | | | | | | | | | | for now).
| * | | Improve styling of advanced-tab-content gasInput rowDan Miller2018-12-043-5/+11
| | | |
| * | | Add tests for advanced-tab-component.js and subcomponents.Dan Miller2018-12-045-18/+282
| | | |
| * | | Remove gas slider from advance-tab-content.componentDan Miller2018-12-043-19/+2
| | | |
| * | | Split advanced-tab-content.component.js render() method into smaller ↵Dan Miller2018-12-043-31/+63
| | | | | | | | | | | | | | | | 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-0421-63/+538
| | | | | | | | | | | | | | | | customize modal.
| * | | Use BEM for css in gas-modal-page-containerDan Miller2018-12-043-26/+28
| | | |
| * | | Use correct message key in gas-modal-page-container.component.jsDan Miller2018-12-041-1/+1
| | | |
| * | | Adds new gas customization modal container (without content)Dan Miller2018-12-0411-29/+371
|/ / /
* | | Merge pull request #5876 from MetaMask/Version-5.1.0v5.1.0Thomas Huang2018-12-042-1/+8
|\ \ \ | | | | | | | | Version 5.1.0: East Bay Represent
| * | | Version 5.1.0: East BayDan Finlay2018-12-042-1/+8
|/ / /
* | | Merge pull request #5875 from MetaMask/UpdatePhishingWarningThomas Huang2018-12-041-5/+4
|\ \ \ | | | | | | | | Update phishing warning copy
| * | | Update phishing warning copyDan Finlay2018-12-041-5/+4
| | | | | | | | | | | | | | | | Per advice of legal counsel.
* | | | Add docs link (#5870)Dan Finlay2018-12-041-1/+3
|/ / /
* | | Hide link for phishing-detect page (#5864)Michael - Blurpesec2018-12-021-1/+1
| | | | | | | | | | | | | | | | | | * Soften language on phishing-detect page * remove quotes
* | | Merge pull request #5865 from MetaMask/mmc-fixBruno Barbieri2018-12-011-1/+0
|\ \ \ | | | | | | | | Fix visibility of mmc
| * | | fix visibilityBruno Barbieri2018-12-011-1/+0
|/ / /
* | | Save recent network balances in local storage (#5843)Dan J Miller2018-12-0115-28/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-302-2/+24
| | |
* | | 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.
* | | | Merge pull request #5835 from MetaMask/revert-5412-after-install-stepsWhymarrh Whitby2018-11-275-9/+53
|\ \ \ \ | |/ / / |/| | | Open full-screen UI on install
| * | | Update e2e tests to handle any post-install window creationWhymarrh Whitby2018-11-273-9/+38
| | | |
| * | | Add JSDoc to closeAllWindowHandlesExcept e2e helper fnWhymarrh Whitby2018-11-271-0/+7
| | | |
| * | | 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
|/ / /
* | | 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
* | | Hide app-header when provider request pending (#5831)Whymarrh Whitby2018-11-272-5/+19
| | |
* | | Autofill gasPrice for retry attempts with either the recommended gasprice or ↵Frankie2018-11-272-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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 disabled cursor in .network-disabled state (#5829)Whymarrh Whitby2018-11-271-1/+1
| | | |
* | | | Trim whitespace from seed phrase during import (#5827)Whymarrh Whitby2018-11-271-2/+4
| | | |
* | | | Merge pull request #5832 from whymarrh/connect-request-notifsWhymarrh Whitby2018-11-272-4/+8
|\ \ \ \ | | | | | | | | | | Show Connect Requests count in extension badge
| * | | | 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
|/ / / /
* | | | Merge pull request #5816 from MetaMask/issue-5815Thomas Huang2018-11-2521-44/+44
|\ \ \ \ | | | | | | | | | | Increase Token Symbol length to twelve
| * | | | Increase Token Symbol length to twelveThomas Huang2018-11-2321-44/+44
| | | | |
* | | | | change wording of phishing notice, due to EIP 1102 (#5819)Christopher Elwell2018-11-241-1/+1
|/ / / / | | | | | | | | With the EIP 1102 updates, MetaMask *does* now open itself when visiting some websites. Changed the wording here to clarify that MetaMask will not open itself to ask you for your seed phrase.
* | | | Merge pull request #5810 from whymarrh/bump-nvmrcWhymarrh Whitby2018-11-222-9/+10
|\ \ \ \ | | | | | | | | | | Bump Node version to 8.13
| * | | | Update local build instructionsWhymarrh Whitby2018-11-221-8/+9
| | | | |
| * | | | nvm: Bump Node version to 8.13Whymarrh Whitby2018-11-221-1/+1
| | | | |
* | | | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-2212-45/+167
|\ \ \ \ \ | |/ / / / |/| | | | Add Firefox and Brave support for Trezor
| * | | | bump eth-trezor-keyringbrunobar792018-11-222-7288/+7352
| | | | |
| * | | | update package-lockbrunobar792018-11-211-7313/+7277
| | | | |
| * | | | trezor v6brunobar792018-11-213-7419/+7441
| | | | |
| * | | | fix merge conflictsbrunobar792018-11-2172-8609/+8076
| |\ \ \ \
| * | | | | clean upbrunobar792018-11-152-3/+2
| | | | | |
| * | | | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into ↵brunobar792018-11-152-8/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | trezor-v5
| | * | | | | testbrunobar792018-11-151-4/+0
| | | | | | |
| | * | | | | testbrunobar792018-11-151-1/+1
| | | | | | |
| | * | | | | testbrunobar792018-11-151-1/+1
| | | | | | |
| | * | | | | try with custom boxbrunobar792018-11-151-1/+1
| | | | | | |
| | * | | | | package-lock.jsonbrunobar792018-11-151-20/+41
| | | | | | |
| * | | | | | update package-lock.jsonbrunobar792018-11-151-17/+27
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-157-10/+45
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-1/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1446-479/+4603
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-11-07191-3748/+6145
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-21104-8896/+12489
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ fix conflictsbrunobar792018-10-17298-12054/+28334
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update package-lock.jsonbrunobar792018-09-111-95/+167
| | | | | | | | | | | |
| * | | | | | | | | | | fix merge conflictsbrunobar792018-09-114-4/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update package-lock.jsonbrunobar792018-09-111-49/+126
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-06173-2562/+4615
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add port names blacklistbrunobar792018-08-231-0/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | handle onDisconnectbrunobar792018-08-231-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-2311-5776/+1605
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update package-lockbrunobar792018-08-221-6/+14
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-224-18/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix commentbrunobar792018-08-211-2/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-21116-4856/+8379
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update package-lockbrunobar792018-08-211-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix e2e testsbrunobar792018-08-111-30/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | undo permission changebrunobar792018-08-111-1/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add error messagesbrunobar792018-08-111-2/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | hide export private key for trezor accountsbrunobar792018-08-102-32/+46
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fixesbrunobar792018-08-104-6779/+49
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add app/vendor dir to eslintignorebrunobar792018-08-101-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use new connect.js filebrunobar792018-08-102-9479/+1245
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-1018-29/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ update package-lock.jsonbrunobar792018-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-0921-32534/+32471
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | clean upbrunobar792018-08-053-3/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | trezor v5 working on firefoxbrunobar792018-08-057-2/+15084
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799)Whymarrh Whitby2018-11-221-16/+29
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Show byte count for hex data on confirm screen (#5798)Whymarrh Whitby2018-11-221-1/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switchWhymarrh Whitby2018-11-2241-795/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the new UI for first time users
| * | | | | | | | | | | | | | | | | | | Remove first-time and navigate-txs integration testsWhymarrh Whitby2018-11-215-340/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Speed up genStates script by using built-in require fnWhymarrh Whitby2018-11-211-4/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | ci: Drop old UI e2e tests from CircleCIWhymarrh Whitby2018-11-211-41/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove Mascara from CircleCI configWhymarrh Whitby2018-11-211-13/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove "Beta" from welcome messagesWhymarrh Whitby2018-11-2121-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update new UI links in the old UI s/Beta/New/Whymarrh Whitby2018-11-211-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove "Beta" from header logoWhymarrh Whitby2018-11-213-116/+63
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fnWhymarrh Whitby2018-11-211-5/+16
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update new UI e2e tests for new UI defaultWhymarrh Whitby2018-11-214-209/+21
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Default to the new UI for first time usersWhymarrh Whitby2018-11-214-32/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5791 from MetaMask/fix-ledger-stuffBruno Barbieri2018-11-212-208/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | Bump eth-ledger-bridge-keyring
| * | | | | | | | | | | | | | | | | | update package-lock.jsonbrunobar792018-11-212-208/+208
|/ / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / Version 5.0.3 (#5785)Dan Finlay2018-11-216-277/+270
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Version 5.0.3 Includes a fix to the `version:bump` script that now correctly updates the changelog header. * Include inpage provider events
* | | | | | | | | | | | | | | | | Fix button styling for Create Account Connect (#5787)Alexander Tseung2018-11-203-47/+13
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-2037-104/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix rounding issue when sending max tokens * Ensure amount row shows exact amount of max tokens on send screen (#2) * Fix tests * Change stored redux value from BigNumber to hex string. Fix TokenInput default value
* | | | | | | | | | | | | | | | | 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-174-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1715-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors
* | | | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-179-229/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | | | | | | | delete generated fileEsteban MIno2018-11-161-1171/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | detect osEsteban MIno2018-11-162-1/+1176
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix url and remove -e fr macosEsteban MIno2018-11-161-3/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | working on macosEsteban MIno2018-11-161-3/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix macos attemptEsteban MIno2018-11-161-1/+3
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | sed a command macosEsteban MIno2018-11-161-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add -i suffix -e for macosEsteban MIno2018-11-161-4/+4
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add -i workaround suffix for macosEsteban MIno2018-11-161-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix typosEsteban MIno2018-11-161-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add commentsEsteban MIno2018-11-161-7/+15
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | delete use of grepEsteban MIno2018-11-161-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | provide automatic changelog since last tag for linuxEsteban MIno2018-11-163-1/+18
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Update npm dependencies to reduce vulnerabilities (#5556)Bruno Barbieri2018-11-162-8970/+12368
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #5759 from MetaMask/drizzle-updateBruno Barbieri2018-11-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update drizzle-test job
| * | | | | | | | | | | | | | | | remove error flags from drizzle setupbrunobar792018-11-151-4/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5760 from MetaMask/retroactive-changelogkumavis2018-11-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Add old changelog entry
| * | | | | | | | | | | | | | | | Add old changelog entryDan Finlay2018-11-151-0/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describing when we added support for cross-extension comms. https://github.com/MetaMask/metamask-extension/pull/3997
* | | | | | | | | | | | | / / / Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-156-6/+44
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Show APPROVED status for transactions that have been approved but not submittedAlexander Tseung2018-11-142-1/+35
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Update Balanc3 API (#5744)Paul Bouchon2018-11-143-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* | | | | | | | | | | | | | Update support links to zendesk (#5745)Bruno Barbieri2018-11-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix loose accounts help link * Update support site link
* | | | | | | | | | | | | | Repair link to reset instructions (#5733)Micah Alcorn2018-11-141-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | encourage stackexchange in issue templates (#5737)bobby dresser2018-11-141-4/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-1419-19/+795
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Slovenian and slovak fixes (#5730)Filip Š2018-11-133-330/+1703
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix Slovenian translation * Add Slovak translation
* | | | | | | | | | | | | Version 5.0.2v5Dan Finlay2018-11-102-1/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | EIP-1102: Update publicConfig store concurrently with approvalPaul Bouchon2018-11-103-33/+29
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5674 from MetaMask/responsive-e2e-testsThomas Huang2018-11-104-18/+376
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e tests for responsive behaviour
| * | | | | | | | | | | | | Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.specDan Miller2018-11-084-18/+376
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Increase number of ETH decimals displayed in the balance view from 3 to 4 ↵Alexander Tseung2018-11-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5710)
* | | | | | | | | | | | | | 1102: Fix inpage listener syntax (#5708) (#5709)Noah I2018-11-091-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Version 5.0.1 (#5694)Dan Finlay2018-11-082-1/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundleDan J Miller2018-11-084-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-1/+48
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Cleanupbitpshr2018-11-081-18/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 1102: use postMessage instead of injected scripts to bypass CSPbitpshr2018-11-081-17/+13
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | wipbitpshr2018-11-082-24/+39
| | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 07:12:04 +0800