Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing translation to the gas customization component. | Dan Miller | 2018-12-13 | 6 | -14/+47 |
| | |||||
* | Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-tx | Dan J Miller | 2018-12-12 | 6 | -11/+23 |
|\ | | | | | Ensures that advanced tab gas limit reflects tx gas limit | ||||
| * | Ensures that advanced tab gas limit reflects tx gas limit | Dan Miller | 2018-12-12 | 6 | -11/+23 |
|/ | |||||
* | Add submitDisabled prop to Modals. Disable submit button when creating a ↵ | Alexander Tseung | 2018-12-12 | 4 | -2/+44 |
| | | | | cancel transaction (#5910) | ||||
* | Merge pull request #5902 from MetaMask/i5846-ProviderCrashes | Thomas Huang | 2018-12-12 | 4 | -468/+1057 |
|\ | | | | | Fix provider crashes | ||||
| * | Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelog | Thomas Huang | 2018-12-12 | 2 | -2/+9 |
| |\ | | | | | | | Changelog and version bump for 5.2.0 | ||||
| | * | Changelog and version bump for 5.2.0 | Dan Miller | 2018-12-12 | 2 | -2/+9 |
| |/ | |||||
| * | Merge branch 'develop' into i5846-ProviderCrashes | Dan Finlay | 2018-12-11 | 15 | -68/+395 |
| |\ | |||||
| * | | Bump package lock, mostly to https links | Dan Finlay | 2018-12-11 | 1 | -465/+1047 |
| | | | |||||
| * | | Bump json-rpc-engine to v4.0.0 | Dan Finlay | 2018-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | Show Failed transaction in the browser notification for on-chain failures ↵ | Alexander Tseung | 2018-12-11 | 1 | -4/+7 |
| |/ |/| | | | | | (#5904) | ||||
* | | Improve ux for low gas price set (#5862) | Dan J Miller | 2018-12-11 | 15 | -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 Zinsmeister | 2018-12-10 | 2 | -1/+2 |
| | |||||
* | Group transactions by nonce (#5886) | Alexander Tseung | 2018-12-10 | 47 | -373/+1208 |
| | |||||
* | Merge pull request #5892 from MetaMask/fix-net-version-race-condition | Thomas Huang | 2018-12-08 | 1 | -4/+10 |
|\ | | | | | Fix race condition in network controller lookup() method. | ||||
| * | Fix race condition in network controller lookup() method. | Dan Miller | 2018-12-07 | 1 | -4/+10 |
| | | |||||
* | | Merge pull request #5890 from whymarrh/pl-i18n | Whymarrh Whitby | 2018-12-08 | 1 | -0/+9 |
|\ \ | | | | | | | Fill in more Polish message translations | ||||
| * | | Fill in more Polish message translations | Whymarrh Whitby | 2018-12-06 | 1 | -0/+9 |
| | | | |||||
* | | | Merge pull request #5891 from whymarrh/npm-audit | Whymarrh Whitby | 2018-12-07 | 5 | -2552/+2542 |
|\ \ \ | |/ / |/| | | Migrate test deps CI job to npm audit | ||||
| * | | Deduplicate package.json file | Whymarrh Whitby | 2018-12-07 | 2 | -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 vuln | Whymarrh Whitby | 2018-12-07 | 2 | -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 open | Whymarrh Whitby | 2018-12-07 | 2 | -7/+0 |
| | | | |||||
| * | | Remove beefy dependency and its usages | Whymarrh Whitby | 2018-12-07 | 3 | -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 audit | Whymarrh Whitby | 2018-12-07 | 4 | -579/+253 |
| | | | | | | | | | | | | Refs #4751 | ||||
| * | | npm audit fix | Whymarrh Whitby | 2018-12-06 | 2 | -452/+392 |
| | | | |||||
| * | | circleci: Disable npm audit when installing packages | Whymarrh Whitby | 2018-12-06 | 1 | -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 errors | Whymarrh Whitby | 2018-12-06 | 1 | -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-height | Whymarrh Whitby | 2018-12-06 | 1 | -1/+2 |
|\ \ | |/ |/| | Force main container wrapper height to fill remaining space | ||||
| * | Replace height: 100% rule with workaround for flexbox quirks | Whymarrh Whitby | 2018-12-06 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-d | Dan J Miller | 2018-12-05 | 104 | -264/+7147 |
|\ | | | | | Gas customization features | ||||
| * | Fix styling of send screen in extension view when hex data on. | Dan Miller | 2018-12-04 | 4 | -12/+17 |
| | | |||||
| * | Final gas customization fixes | Dan Miller | 2018-12-04 | 18 | -104/+198 |
| | | |||||
| * | Clear custom gas data on hiding of gas customization modal. | Dan Miller | 2018-12-04 | 1 | -4/+12 |
| | | |||||
| * | Modify results of API data to better fit gas chart: remove outliers, pad data | Dan Miller | 2018-12-04 | 5 | -44/+126 |
| | | |||||
| * | Add loading spinners when waiting for APIs in the gas customization modal | Dan Miller | 2018-12-04 | 9 | -6/+61 |
| | | |||||
| * | Uses more reliable api on main send screen; caches basic api results in modal | Dan Miller | 2018-12-04 | 21 | -140/+309 |
| | | |||||
| * | Fix "fastest" translation message; change to sentence case | Dan Miller | 2018-12-04 | 1 | -1/+1 |
| | | |||||
| * | Improve responsiveness of customize speed up slider. | Dan Miller | 2018-12-04 | 3 | -6/+76 |
| | | |||||
| * | Make gas customization modal responsive. | Dan Miller | 2018-12-04 | 7 | -1/+32 |
| | | |||||
| * | Add c3 and d3 to the separate dependencies bundle. | Dan Miller | 2018-12-04 | 1 | -0/+2 |
| | | |||||
| * | Add gas data to integration test json data set. | Dan Miller | 2018-12-04 | 3 | -3/+633 |
| | | |||||
| * | Remove gas customization integration tests (in favour of e2e tests) | Dan Miller | 2018-12-04 | 3 | -36/+317 |
| | | |||||
| * | Fixes for components that break e2e gas customization tests, plus unit test ↵ | Dan Miller | 2018-12-04 | 9 | -21/+102 |
| | | | | | | | | updates. | ||||
| * | Update e2e tests for new gas customization modal. | Dan Miller | 2018-12-04 | 5 | -21/+62 |
| | | |||||
| * | Connect gas price chart to gas station api. | Dan Miller | 2018-12-04 | 3 | -41/+204 |
| | | |||||
| * | Adds speed up slide-in gas customization sidebar | Dan Miller | 2018-12-04 | 19 | -58/+306 |
| | | |||||
| * | Adds createSpeedUpTransaction to txController | Dan Miller | 2018-12-04 | 3 | -0/+97 |
| | | |||||
| * | Redesign of gas customization basic tab. | Dan Miller | 2018-12-04 | 8 | -10/+134 |
| | | |||||
| * | Clean up for mmui-i11-custom-gas-price-chart branch | Dan Miller | 2018-12-04 | 4 | -33/+25 |
| | | |||||
| * | Improve data management and tests for gas-modal-page-container price estimates. | Dan Miller | 2018-12-04 | 4 | -20/+67 |
| | | |||||
| * | Update tests, plus some lint fixes, for gas-price-chart | Dan Miller | 2018-12-04 | 3 | -53/+204 |
| | | |||||
| * | Clean up gas chart code. | Dan Miller | 2018-12-04 | 3 | -362/+373 |
| | | |||||
| * | Add control arrows to advanced gas tab inputs. | Dan Miller | 2018-12-04 | 3 | -1/+63 |
| | | |||||
| * | Complete integration of gas chart with redux. | Dan Miller | 2018-12-04 | 9 | -14/+148 |
| | | |||||
| * | Read only connection of gas price chart to redux | Dan Miller | 2018-12-04 | 13 | -28/+245 |
| | | |||||
| * | Gas price chart improvements, redesign, bug fixes, and set up to receive ↵ | Dan Miller | 2018-12-04 | 5 | -88/+300 |
| | | | | | | | | external data | ||||
| * | Adds not yet functional gas price chart. | Dan Miller | 2018-12-04 | 11 | -20/+290 |
| | | |||||
| * | Lint and unit test fixes. | Dan Miller | 2018-12-04 | 3 | -5/+4 |
| | | |||||
| * | Clean up for advanced gas tab customization changes. | Dan Miller | 2018-12-04 | 3 | -19/+16 |
| | | |||||
| * | Adds redesign for the customize gas advanced tab. | Dan Miller | 2018-12-04 | 19 | -152/+332 |
| | | |||||
| * | Test updates and additions for button integration with send screen. | Dan Miller | 2018-12-04 | 19 | -64/+465 |
| | | |||||
| * | Integrate gas buttons with the send screen. | Dan Miller | 2018-12-04 | 14 | -41/+301 |
| | | |||||
| * | Connects remained of the gas customization component to redux. | Dan Miller | 2018-12-04 | 22 | -194/+497 |
| | | |||||
| * | Adds gas-duck.test.js tests. | Dan Miller | 2018-12-04 | 1 | -0/+300 |
| | | |||||
| * | Styling fixes for gas customization advanced tab content. | Dan Miller | 2018-12-04 | 4 | -3/+2 |
| | | |||||
| * | Improvements to propdefaults in button-group.component and ↵ | Dan Miller | 2018-12-04 | 2 | -2/+3 |
| | | | | | | | | basic-tab-content.component | ||||
| * | Connect the gas-button-group component to redux and a live api. | Dan Miller | 2018-12-04 | 15 | -111/+573 |
| | | |||||
| * | Adds basic tab content to gas customizer, with styled button group (static, ↵ | Dan Miller | 2018-12-04 | 16 | -15/+615 |
| | | | | | | | | for now). | ||||
| * | Improve styling of advanced-tab-content gasInput row | Dan Miller | 2018-12-04 | 3 | -5/+11 |
| | | |||||
| * | Add tests for advanced-tab-component.js and subcomponents. | Dan Miller | 2018-12-04 | 5 | -18/+282 |
| | | |||||
| * | Remove gas slider from advance-tab-content.component | Dan Miller | 2018-12-04 | 3 | -19/+2 |
| | | |||||
| * | Split advanced-tab-content.component.js render() method into smaller ↵ | Dan Miller | 2018-12-04 | 3 | -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 Miller | 2018-12-04 | 21 | -63/+538 |
| | | | | | | | | customize modal. | ||||
| * | Use BEM for css in gas-modal-page-container | Dan Miller | 2018-12-04 | 3 | -26/+28 |
| | | |||||
| * | Use correct message key in gas-modal-page-container.component.js | Dan Miller | 2018-12-04 | 1 | -1/+1 |
| | | |||||
| * | Adds new gas customization modal container (without content) | Dan Miller | 2018-12-04 | 11 | -29/+371 |
|/ | |||||
* | Merge pull request #5876 from MetaMask/Version-5.1.0v5.1.0 | Thomas Huang | 2018-12-04 | 2 | -1/+8 |
|\ | | | | | Version 5.1.0: East Bay Represent | ||||
| * | Version 5.1.0: East Bay | Dan Finlay | 2018-12-04 | 2 | -1/+8 |
|/ | |||||
* | Merge pull request #5875 from MetaMask/UpdatePhishingWarning | Thomas Huang | 2018-12-04 | 1 | -5/+4 |
|\ | | | | | Update phishing warning copy | ||||
| * | Update phishing warning copy | Dan Finlay | 2018-12-04 | 1 | -5/+4 |
| | | | | | | | | Per advice of legal counsel. | ||||
* | | Add docs link (#5870) | Dan Finlay | 2018-12-04 | 1 | -1/+3 |
|/ | |||||
* | Hide link for phishing-detect page (#5864) | Michael - Blurpesec | 2018-12-02 | 1 | -1/+1 |
| | | | | | | * Soften language on phishing-detect page * remove quotes | ||||
* | Merge pull request #5865 from MetaMask/mmc-fix | Bruno Barbieri | 2018-12-01 | 1 | -1/+0 |
|\ | | | | | Fix visibility of mmc | ||||
| * | fix visibility | Bruno Barbieri | 2018-12-01 | 1 | -1/+0 |
|/ | |||||
* | Save recent network balances in local storage (#5843) | Dan J Miller | 2018-12-01 | 15 | -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 Bouchon | 2018-12-01 | 1 | -1/+3 |
| | |||||
* | Fixed Vivek's bug (#5860) | Dan Finlay | 2018-11-30 | 1 | -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.4 | Dan Finlay | 2018-11-30 | 2 | -2/+24 |
| | |||||
* | transactions/tx-gas-utils - add the acctual response for eth_getCode for ↵ | Frankie | 2018-11-30 | 1 | -0/+9 |
| | | | | NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840) | ||||
* | Merge pull request #5848 from MetaMask/Less-Certain-Language | Whymarrh Whitby | 2018-11-29 | 1 | -1/+1 |
|\ | | | | | Soften accusatory language on phishing warning | ||||
| * | Soften accusatory language on phishing warning | Dan Finlay | 2018-11-29 | 1 | -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-steps | Whymarrh Whitby | 2018-11-27 | 5 | -9/+53 |
|\ \ | |/ |/| | Open full-screen UI on install | ||||
| * | Update e2e tests to handle any post-install window creation | Whymarrh Whitby | 2018-11-27 | 3 | -9/+38 |
| | | |||||
| * | Add JSDoc to closeAllWindowHandlesExcept e2e helper fn | Whymarrh Whitby | 2018-11-27 | 1 | -0/+7 |
| | | |||||
| * | Open full-screen UI on install | Whymarrh Whitby | 2018-11-27 | 1 | -5/+4 |
| | | |||||
| * | Revert "Don't open MetaMask website after install" | Whymarrh Whitby | 2018-11-27 | 1 | -0/+9 |
|/ | |||||
* | Pin two module versions to avoid flatmap-stream hack (#5839) | Dan Finlay | 2018-11-27 | 1 | -2/+2 |
| | | | | | | | | | The flatmap-stream module was compromised. MetaMask was NOT affected, but two of our dependencies could include it if they updated, so I am temporarily pinning those versions until they can be updated consciously. Related to https://github.com/dominictarr/event-stream/issues/116 | ||||
* | Hide app-header when provider request pending (#5831) | Whymarrh Whitby | 2018-11-27 | 2 | -5/+19 |
| | |||||
* | Autofill gasPrice for retry attempts with either the recommended gasprice or ↵ | Frankie | 2018-11-27 | 2 | -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) | Frankie | 2018-11-27 | 1 | -4/+6 |
| | |||||
* | Merge pull request #5792 from MetaMask/signed-type-data-error-hw-wallet | Bruno Barbieri | 2018-11-27 | 1 | -9/+16 |
|\ | | | | | Consider HW Wallets for signTypedMessage | ||||
| * | Use Array.includes | Bruno Barbieri | 2018-11-27 | 1 | -4/+4 |
| | | |||||
| * | remove extra semicolon | brunobar79 | 2018-11-21 | 1 | -1/+1 |
| | | |||||
| * | consider hw wallets | brunobar79 | 2018-11-21 | 1 | -9/+16 |
| | | |||||
* | | Show disabled cursor in .network-disabled state (#5829) | Whymarrh Whitby | 2018-11-27 | 1 | -1/+1 |
| | | |||||
* | | Trim whitespace from seed phrase during import (#5827) | Whymarrh Whitby | 2018-11-27 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #5832 from whymarrh/connect-request-notifs | Whymarrh Whitby | 2018-11-27 | 2 | -4/+8 |
|\ \ | | | | | | | Show Connect Requests count in extension badge | ||||
| * | | Show Connect Requests count in extension badge | Whymarrh Whitby | 2018-11-26 | 1 | -1/+3 |
| | | | |||||
| * | | Use initState to avoid type-checking providerRequests in state | Whymarrh Whitby | 2018-11-26 | 1 | -3/+5 |
|/ / | |||||
* | | Merge pull request #5816 from MetaMask/issue-5815 | Thomas Huang | 2018-11-25 | 21 | -44/+44 |
|\ \ | | | | | | | Increase Token Symbol length to twelve | ||||
| * | | Increase Token Symbol length to twelve | Thomas Huang | 2018-11-23 | 21 | -44/+44 |
| | | | |||||
* | | | change wording of phishing notice, due to EIP 1102 (#5819) | Christopher Elwell | 2018-11-24 | 1 | -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-nvmrc | Whymarrh Whitby | 2018-11-22 | 2 | -9/+10 |
|\ \ | | | | | | | Bump Node version to 8.13 | ||||
| * | | Update local build instructions | Whymarrh Whitby | 2018-11-22 | 1 | -8/+9 |
| | | | |||||
| * | | nvm: Bump Node version to 8.13 | Whymarrh Whitby | 2018-11-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5797 from MetaMask/trezor-v6 | Bruno Barbieri | 2018-11-22 | 12 | -45/+167 |
|\ \ \ | |/ / |/| | | Add Firefox and Brave support for Trezor | ||||
| * | | bump eth-trezor-keyring | brunobar79 | 2018-11-22 | 2 | -7288/+7352 |
| | | | |||||
| * | | update package-lock | brunobar79 | 2018-11-21 | 1 | -7313/+7277 |
| | | | |||||
| * | | trezor v6 | brunobar79 | 2018-11-21 | 3 | -7419/+7441 |
| | | | |||||
| * | | fix merge conflicts | brunobar79 | 2018-11-21 | 72 | -8609/+8076 |
| |\ \ | |||||
| * | | | clean up | brunobar79 | 2018-11-15 | 2 | -3/+2 |
| | | | | |||||
| * | | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-11-15 | 2 | -8/+19 |
| |\ \ \ | | | | | | | | | | | | | | | | trezor-v5 | ||||
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | try with custom box | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | package-lock.json | brunobar79 | 2018-11-15 | 1 | -20/+41 |
| | | | | | |||||
| * | | | | update package-lock.json | brunobar79 | 2018-11-15 | 1 | -17/+27 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 7 | -10/+45 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 3 | -1/+40 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into trezor-v5 | brunobar79 | 2018-11-14 | 46 | -479/+4603 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-11-07 | 191 | -3748/+6145 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 104 | -8896/+12489 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 298 | -12054/+28334 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -95/+167 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix merge conflicts | brunobar79 | 2018-09-11 | 4 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -49/+126 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 173 | -2562/+4615 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add port names blacklist | brunobar79 | 2018-08-23 | 1 | -0/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | handle onDisconnect | brunobar79 | 2018-08-23 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-23 | 11 | -5776/+1605 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | update package-lock | brunobar79 | 2018-08-22 | 1 | -6/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-22 | 4 | -18/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fix comment | brunobar79 | 2018-08-21 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-21 | 116 | -4856/+8379 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | update package-lock | brunobar79 | 2018-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix e2e tests | brunobar79 | 2018-08-11 | 1 | -30/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | undo permission change | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | add error messages | brunobar79 | 2018-08-11 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | hide export private key for trezor accounts | brunobar79 | 2018-08-10 | 2 | -32/+46 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fixes | brunobar79 | 2018-08-10 | 4 | -6779/+49 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | add app/vendor dir to eslintignore | brunobar79 | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | use new connect.js file | brunobar79 | 2018-08-10 | 2 | -9479/+1245 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-10 | 18 | -29/+194 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | update package-lock.json | brunobar79 | 2018-08-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 21 | -32534/+32471 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-05 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | trezor v5 working on firefox | brunobar79 | 2018-08-05 | 7 | -2/+15084 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) | Whymarrh Whitby | 2018-11-22 | 1 | -16/+29 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Show byte count for hex data on confirm screen (#5798) | Whymarrh Whitby | 2018-11-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switch | Whymarrh Whitby | 2018-11-22 | 41 | -795/+166 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the new UI for first time users | ||||
| * | | | | | | | | | | | | | | | | | Remove first-time and navigate-txs integration tests | Whymarrh Whitby | 2018-11-21 | 5 | -340/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Speed up genStates script by using built-in require fn | Whymarrh Whitby | 2018-11-21 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | ci: Drop old UI e2e tests from CircleCI | Whymarrh Whitby | 2018-11-21 | 1 | -41/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Remove Mascara from CircleCI config | Whymarrh Whitby | 2018-11-21 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Remove "Beta" from welcome messages | Whymarrh Whitby | 2018-11-21 | 21 | -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 back | Whymarrh Whitby | 2018-11-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Update new UI links in the old UI s/Beta/New/ | Whymarrh Whitby | 2018-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Remove "Beta" from header logo | Whymarrh Whitby | 2018-11-21 | 3 | -116/+63 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fn | Whymarrh Whitby | 2018-11-21 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Update new UI e2e tests for new UI default | Whymarrh Whitby | 2018-11-21 | 4 | -209/+21 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Default to the new UI for first time users | Whymarrh Whitby | 2018-11-21 | 4 | -32/+26 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #5791 from MetaMask/fix-ledger-stuff | Bruno Barbieri | 2018-11-21 | 2 | -208/+208 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Bump eth-ledger-bridge-keyring | ||||
| * | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-11-21 | 2 | -208/+208 |
|/ / / / / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / / / / | Version 5.0.3 (#5785) | Dan Finlay | 2018-11-21 | 6 | -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 Tseung | 2018-11-20 | 3 | -47/+13 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Fix rounding issue when sending max tokens (#5695) | Alexander Tseung | 2018-11-20 | 37 | -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 Bouchon | 2018-11-18 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765) | Dan Finlay | 2018-11-17 | 4 | -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 Whitby | 2018-11-17 | 15 | -37/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors | ||||
* | | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769) | Frankie | 2018-11-17 | 9 | -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 file | Esteban MIno | 2018-11-16 | 1 | -1171/+0 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | detect os | Esteban MIno | 2018-11-16 | 2 | -1/+1176 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | fix url and remove -e fr macos | Esteban MIno | 2018-11-16 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | working on macos | Esteban MIno | 2018-11-16 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | fix macos attempt | Esteban MIno | 2018-11-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | sed a command macos | Esteban MIno | 2018-11-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | add -i suffix -e for macos | Esteban MIno | 2018-11-16 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | add -i workaround suffix for macos | Esteban MIno | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | fix typos | Esteban MIno | 2018-11-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | add comments | Esteban MIno | 2018-11-16 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | delete use of grep | Esteban MIno | 2018-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | provide automatic changelog since last tag for linux | Esteban MIno | 2018-11-16 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Update npm dependencies to reduce vulnerabilities (#5556) | Bruno Barbieri | 2018-11-16 | 2 | -8970/+12368 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #5759 from MetaMask/drizzle-update | Bruno Barbieri | 2018-11-15 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update drizzle-test job | ||||
| * | | | | | | | | | | | | | | remove error flags from drizzle setup | brunobar79 | 2018-11-15 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #5760 from MetaMask/retroactive-changelog | kumavis | 2018-11-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Add old changelog entry | ||||
| * | | | | | | | | | | | | | | Add old changelog entry | Dan Finlay | 2018-11-15 | 1 | -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 Finlay | 2018-11-15 | 6 | -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 title | Paul Bouchon | 2018-11-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Show APPROVED status for transactions that have been approved but not submitted | Alexander Tseung | 2018-11-14 | 2 | -1/+35 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Update Balanc3 API (#5744) | Paul Bouchon | 2018-11-14 | 3 | -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 Barbieri | 2018-11-14 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix loose accounts help link * Update support site link | ||||
* | | | | | | | | | | | | Repair link to reset instructions (#5733) | Micah Alcorn | 2018-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | encourage stackexchange in issue templates (#5737) | bobby dresser | 2018-11-14 | 1 | -4/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixes #3425: Better support for batch transactions (#5437) | PaddyMc | 2018-11-14 | 19 | -19/+795 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Slovenian and slovak fixes (#5730) | Filip Š | 2018-11-13 | 3 | -330/+1703 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix Slovenian translation * Add Slovak translation | ||||
* | | | | | | | | | | | | Version 5.0.2v5 | Dan Finlay | 2018-11-10 | 2 | -1/+6 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | EIP-1102: Update publicConfig store concurrently with approval | Paul Bouchon | 2018-11-10 | 3 | -33/+29 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #5674 from MetaMask/responsive-e2e-tests | Thomas Huang | 2018-11-10 | 4 | -18/+376 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e tests for responsive behaviour | ||||
| * | | | | | | | | | | | | Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.spec | Dan Miller | 2018-11-08 | 4 | -18/+376 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Increase number of ETH decimals displayed in the balance view from 3 to 4 ↵ | Alexander Tseung | 2018-11-10 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5710) | ||||
* | | | | | | | | | | | | | 1102: Fix inpage listener syntax (#5708) (#5709) | Noah I | 2018-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Version 5.0.1 (#5694) | Dan Finlay | 2018-11-08 | 2 | -1/+5 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundle | Dan J Miller | 2018-11-08 | 4 | -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.js | Dan Miller | 2018-11-01 | 4 | -1/+48 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Cleanup | bitpshr | 2018-11-08 | 1 | -18/+10 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | 1102: use postMessage instead of injected scripts to bypass CSP | bitpshr | 2018-11-08 | 1 | -17/+13 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | wip | bitpshr | 2018-11-08 | 2 | -24/+39 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #5481 from MetaMask/reducers | Thomas Huang | 2018-11-07 | 3 | -3/+1580 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | tests/Reducers | ||||
| * | | | | | | | | | | | | | nextUnreadNotice undefined rather than null | Thomas | 2018-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Remove .only | Thomas | 2018-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is ↵ | Thomas | 2018-10-31 | 2 | -23/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatched | ||||
| * | | | | | | | | | | | | | Merge branch 'develop' into reducers | Thomas | 2018-10-31 | 221 | -4475/+11298 |
| |\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Isolate variables to individual tests | Thomas | 2018-10-31 | 1 | -53/+64 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Reducers | Thomas | 2018-10-10 | 2 | -0/+1491 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Set maxMode and toNickname defaults for clear_send | Thomas | 2018-10-10 | 1 | -3/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #5691 from MetaMask/fix-typo | Bruno Barbieri | 2018-11-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on drizzle test description | ||||
| * | | | | | | | | | | | | | | fix typo | brunobar79 | 2018-11-07 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #5689 from MetaMask/reject-cached-approval | Bruno Barbieri | 2018-11-07 | 4 | -13/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EIP-1102: Clear approvals on rejection | ||||
| * | | | | | | | | | | | | | | update drizzle tests | brunobar79 | 2018-11-07 | 1 | -5/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Revert package-lock.json | bitpshr | 2018-11-07 | 1 | -6780/+6762 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix lint errors | bitpshr | 2018-11-07 | 2 | -6763/+6781 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Remove injected script tags after use | bitpshr | 2018-11-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Clear cached approval after rejection | bitpshr | 2018-11-07 | 2 | -8/+11 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Version 5.0.0 (#5685) | Dan Finlay | 2018-11-07 | 2 | -1/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Update the colour of the default image used on Connect Request (#5678) | Whymarrh Whitby | 2018-11-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Update "Learn more" link on 1102 connect screen (#5677) | Whymarrh Whitby | 2018-11-06 | 1 | -1/+7 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Move experimental provider augmentation | bitpshr | 2018-11-06 | 1 | -13/+13 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Add experimental RPC method support | bitpshr | 2018-11-06 | 3 | -6/+20 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Update Connect Request screen design (#5644) | Whymarrh Whitby | 2018-11-06 | 19 | -51/+388 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 locked | bitpshr | 2018-11-06 | 1 | -2/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Mark origins as unapproved if user explicitly locks MetaMask | bitpshr | 2018-11-06 | 2 | -3/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Enable caching | Paul Bouchon | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | isApproved should return false | bitpshr | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Disable mascara tests | bitpshr | 2018-11-06 | 1 | -13/+13 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Increase timeout in Mascara test | bitpshr | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Remove internal listeners | bitpshr | 2018-11-06 | 1 | -6/+15 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | rebase | bitpshr | 2018-11-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Disable approval caching | bitpshr | 2018-11-06 | 4 | -6/+34 |
| | | | | | | | | | | | | | |