Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switch | Whymarrh Whitby | 2018-11-22 | 41 | -795/+166 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-11-21 | 2 | -208/+208 | |
|/ / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / | Version 5.0.3 (#5785) | Dan Finlay | 2018-11-21 | 6 | -277/+270 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | ESLint fixes (#5775) | Whymarrh Whitby | 2018-11-17 | 15 | -37/+37 | |
* | | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769) | Frankie | 2018-11-17 | 9 | -229/+265 | |
* | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | 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 | Dan Finlay | 2018-11-15 | 1 | -0/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | / | Resubmit approved transactions on new block (#5752) | Dan Finlay | 2018-11-15 | 6 | -6/+44 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | 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 support links to zendesk (#5745) | Bruno Barbieri | 2018-11-14 | 2 | -2/+2 | |
* | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 (#5... | Alexander Tseung | 2018-11-10 | 2 | -4/+4 | |
* | | | | | | | | | | | | | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 dispat... | Thomas | 2018-10-31 | 2 | -23/+96 | |
| * | | | | | | | | | | | | | 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 | brunobar79 | 2018-11-07 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5689 from MetaMask/reject-cached-approval | Bruno Barbieri | 2018-11-07 | 4 | -13/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | Differentiate locked and enabled | bitpshr | 2018-11-06 | 4 | -27/+10 | |
* | | | | | | | | | | | | | | Code bath | bitpshr | 2018-11-06 | 4 | -33/+49 | |
* | | | | | | | | | | | | | | Handle logout gracefully | bitpshr | 2018-11-06 | 4 | -25/+42 | |
* | | | | | | | | | | | | | | Fix lint issues | bitpshr | 2018-11-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Only filter selectedAddress from publicConfig store | bitpshr | 2018-11-06 | 1 | -6/+10 | |
* | | | | | | | | | | | | | | Fix race condition with publicConfigStore | bitpshr | 2018-11-06 | 1 | -5/+24 | |
* | | | | | | | | | | | | | | Move convenience methods to _metamask namespace | bitpshr | 2018-11-06 | 1 | -28/+55 | |
* | | | | | | | | | | | | | | Fix lint issues | bitpshr | 2018-11-06 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | Add isUnlocked provider hook | bitpshr | 2018-11-06 | 4 | -3/+29 | |
* | | | | | | | | | | | | | | Differentiate isEnabled and isApproved hook | bitpshr | 2018-11-06 | 1 | -3/+12 | |
* | | | | | | | | | | | | | | Update isEnabled check | bitpshr | 2018-11-06 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | Fix beta e2e tests | bitpshr | 2018-11-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Remove duplicate i18n keys | bitpshr | 2018-11-06 | 2 | -9/+0 | |
* | | | | | | | | | | | | | | Cleanup after rebase | bitpshr | 2018-11-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | EIP-1102: add user privacy option | bitpshr | 2018-11-06 | 34 | -200/+256 | |
* | | | | | | | | | | | | | | EIP-1102: add isEnabled convenience method to provider | bitpshr | 2018-11-06 | 3 | -9/+53 | |
* | | | | | | | | | | | | | | EIP-1102: Add option to force-enable provider | bitpshr | 2018-11-06 | 32 | -784/+672 | |
* | | | | | | | | | | | | | | EIP-1102: updated implementation | bitpshr | 2018-11-06 | 51 | -7656/+8279 | |
* | | | | | | | | | | | | | | Version 4.17.1 | Dan Finlay | 2018-11-06 | 2 | -1/+5 | |
* | | | | | | | | | | | | | | network - infura - hardcode net_version and eth_chainId (#5670) | kumavis | 2018-11-06 | 1 | -0/+33 | |
* | | | | | | | | | | | | | | Update watchAsset ERC20 validation (#5653) | Esteban Miño | 2018-11-06 | 2 | -2/+28 | |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5671 from MetaMask/i18n-tool-fix | kumavis | 2018-11-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | development tools - fix i18n verify tool | kumavis | 2018-11-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge pull request #5651 from MetaMask/kumavis-patch-3 | kumavis | 2018-11-04 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | CI - job-publish-release - fix github command | kumavis | 2018-11-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge pull request #5659 from MetaMask/token-rates-bugfix | kumavis | 2018-11-04 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | token-rates - protect against bad token data | kumavis | 2018-11-03 | 1 | -4/+7 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Revert "support eth_chainId" | Thomas Huang | 2018-11-04 | 1 | -14/+4 | |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #5650 from MetaMask/master | kumavis | 2018-11-02 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5649 from MetaMask/develop | kumavis | 2018-11-02 | 143 | -2196/+3782 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5648 from MetaMask/v4.17.0 | kumavis | 2018-11-02 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | / / / / / / / / / / / | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 4.17.0v4.17.0 | kumavis | 2018-11-02 | 2 | -2/+10 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | fixed currency-display (#5619) | HackyMiner | 2018-10-30 | 2 | -3/+22 | |
* | | | | | | | | | | | | | Merge pull request #5560 from MetaMask/sentry-enhancements2 | kumavis | 2018-10-30 | 10 | -80/+185 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension... | kumavis | 2018-10-30 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into sentry-enhancements2 | kumavis | 2018-10-30 | 128 | -2035/+3082 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-... | kumavis | 2018-10-30 | 129 | -2108/+3130 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-... | kumavis | 2018-10-21 | 8 | -58/+436 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | sentry - include app state in ui errors | kumavis | 2018-10-20 | 5 | -16/+38 | |
| * | | | | | | | | | | | | | | | | sentry - replace raven-js with sentry/browser | kumavis | 2018-10-20 | 6 | -55/+92 | |
| * | | | | | | | | | | | | | | | | blacklist + currency - report error via log instead of throw | kumavis | 2018-10-19 | 2 | -5/+12 | |
| * | | | | | | | | | | | | | | | | lint fix | kumavis | 2018-10-19 | 2 | -3/+1 | |
| * | | | | | | | | | | | | | | | | fetch debugger - only append source stack if no stack is present | kumavis | 2018-10-19 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | | | sentry - failed txs - namespace txMeta for better readability | kumavis | 2018-10-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for bugfix | kumavis | 2018-10-19 | 2 | -11/+39 | |
| * | | | | | | | | | | | | | | | | currency - throw errors on failure | kumavis | 2018-10-19 | 1 | -3/+17 | |
| * | | | | | | | | | | | | | | | | blacklist - throw errors on request/parse failure | kumavis | 2018-10-19 | 1 | -4/+19 | |
| * | | | | | | | | | | | | | | | | sentry - update raven-js | kumavis | 2018-10-19 | 2 | -5/+5 | |
| * | | | | | | | | | | | | | | | | sentry - move isBrave decoration to insides of try-catch | kumavis | 2018-10-19 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | Merge pull request #5567 from MetaMask/HowardBraham-develop | kumavis | 2018-10-30 | 8 | -16/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB... | kumavis | 2018-10-26 | 66 | -1692/+1809 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | old-ui - pending tx - allow undefined values for gas + gasPrice | kumavis | 2018-10-26 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | tx-gas-util - set error message when invalidating tx based on tx data but no ... | kumavis | 2018-10-21 | 1 | -4/+5 | |
| * | | | | | | | | | | | | | | | | | send tx - validate - simplify error message for attempting to call function o... | kumavis | 2018-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | ui - use variable to clarify result of emptiness check | kumavis | 2018-10-21 | 3 | -4/+10 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop | kumavis | 2018-10-21 | 160 | -2452/+8611 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | tx-gas-utils - improve format + comments | kumavis | 2018-10-10 | 1 | -12/+18 | |
| * | | | | | | | | | | | | | | | | | ganache-core merged my PR, so I changed some comments to clarify that ganache... | Howard Braham | 2018-10-10 | 4 | -8/+9 | |
| * | | | | | | | | | | | | | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contract | Howard Braham | 2018-10-10 | 8 | -11/+25 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5596 from MetaMask/validateSignTypedData | kumavis | 2018-10-30 | 4 | -51/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for signTypedData version bump | kumavis | 2018-10-30 | 2 | -37/+49 | |
| * | | | | | | | | | | | | | | | | | Add version to unapprovedMessage | Thomas | 2018-10-25 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | Remove commented out/unused methods | Thomas | 2018-10-25 | 1 | -27/+2 | |
| * | | | | | | | | | | | | | | | | | Validate signTypedData in eth-json-rpc-middleware | Thomas | 2018-10-25 | 2 | -28/+32 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5552 from EthersocialNetwork/eth_chainid | kumavis | 2018-10-30 | 1 | -4/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into eth_chainid | hackyminer | 2018-10-26 | 128 | -1951/+2808 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Update network.js | kumavis | 2018-10-21 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | network - improve logging and type conversion | kumavis | 2018-10-21 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | | | | | | support both eth_chainId and net_version | hackyminer | 2018-10-20 | 1 | -4/+11 | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #5625 from filips123/develop | kumavis | 2018-10-30 | 1 | -105/+658 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Fix Slovenian translation | Filip Š | 2018-10-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Add Slovenian translation for EIP-1102 | Filip Š | 2018-10-27 | 1 | -0/+39 | |
| * | | | | | | | | | | | | | | | | | | | | Fix Slovenian translation | Filip Š | 2018-10-27 | 1 | -105/+619 | |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #5632 from MetaMask/typo-fix | kumavis | 2018-10-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | preferences - fix typo | kumavis | 2018-10-30 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134) | HackyMiner | 2018-10-26 | 69 | -217/+586 | |
* | | | | | | | | | | | | | | | | | | | Fix raised button min-height (#5613) | Alexander Tseung | 2018-10-26 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | deps - bump eth-block-tracker for fix (#5614) | kumavis | 2018-10-26 | 2 | -20/+13 | |
| |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Fix button styling for overflowing text (#5602) | Alexander Tseung | 2018-10-25 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon componen... | Alexander Tseung | 2018-10-25 | 21 | -147/+230 | |
* | | | | | | | | | | | | | | | | | | Fix UnknownFunction showing as Confirm (#5590) | Alexander Tseung | 2018-10-24 | 1 | -0/+11 | |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Add Activity Log entry for onchain failures for a transaction. Change scrolli... | Alexander Tseung | 2018-10-23 | 15 | -112/+23 | |
* | | | | | | | | | | | | | | | | | deploy - docs - publish via npm script (#5580) | kumavis | 2018-10-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Update CHANGELOG.md (#5566) | kumavis | 2018-10-23 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | Merge pull request #5576 from marijnbent/patch-1 | kumavis | 2018-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Updated translation for main network name | Marijn Bent | 2018-10-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Fix signature request styling issues (#5574) | Alexander Tseung | 2018-10-23 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | i18n - update haitian translations (#5565) | kumavis | 2018-10-23 | 2 | -1235/+1312 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5570 from alextsg/i5558-account-display-width | kumavis | 2018-10-21 | 13 | -44/+68 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix account display width for large currency values | Alexander Tseung | 2018-10-21 | 13 | -44/+68 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5569 from MetaMask/fix-drizzle | kumavis | 2018-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | install truffle globally | brunobar79 | 2018-10-21 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
* / | | | | | | | | | | | | | | | | ens-ipfs - refactor for readability (#5568) | kumavis | 2018-10-21 | 8 | -125/+131 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-asset | kumavis | 2018-10-21 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | add support for wallet_watchAsset | Esteban MIno | 2018-10-20 | 2 | -1/+6 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | i18n - use localized names in language selection | Brandon Wissmann | 2018-10-21 | 2 | -22/+22 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5543 from MetaMask/shapeshift-list-item | Thomas Huang | 2018-10-20 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update Shapeshift logo url and adjust list item contents | Thomas | 2018-10-18 | 1 | -3/+2 | |
* | | | | | | | | | | | | | | | | Merge pull request #5561 from MetaMask/deps-fix-gulp | Thomas Huang | 2018-10-20 | 2 | -25/+384 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | deps - fix gulp ref to gulp#v4.0.0 | kumavis | 2018-10-20 | 2 | -25/+384 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | / / / / / / / / / / / / / / | specific add and remove methods for frequentRpcList (#5554) | Esteban Miño | 2018-10-20 | 3 | -28/+46 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Set `NODE_ENV` when generating bundler (#4983) | William Chong | 2018-10-19 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | Merge pull request #5540 from MetaMask/master | kumavis | 2018-10-18 | 2 | -5/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #5539 from MetaMask/v4.16.0 | kumavis | 2018-10-18 | 115 | -995/+4688 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Update CHANGELOG.mdv4.16.0 | Kevin Serrano | 2018-10-18 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | Changelog - fix release dates | kumavis | 2018-10-18 | 1 | -2/+2 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | 4.16.0 | kumavis | 2018-10-18 | 2 | -5/+22 | |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5537 from MetaMask/inpage-provider-maxlisteners | kumavis | 2018-10-18 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | inpage - increase provider max listeners to avoid warnings | kumavis | 2018-10-18 | 1 | -0/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | i18n - add polish (pl) | Bartek | 2018-10-18 | 2 | -0/+1214 | |
* | | | | | | | | | | | | | Merge pull request #5127 from MetaMask/account-tracker-network-change | kumavis | 2018-10-18 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into account-tracker-network-change | kumavis | 2018-09-28 | 337 | -4902/+14253 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | metamask controller - force account tracker to update balances on network change | kumavis | 2018-08-23 | 1 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #5536 from whymarrh/add-token-help | Whymarrh Whitby | 2018-10-18 | 9 | -165/+90 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Extract Add Token button into its own component | Whymarrh Whitby | 2018-10-18 | 8 | -25/+90 | |
| * | | | | | | | | | | | | | | Delete add-token integration test | Whymarrh Whitby | 2018-10-18 | 1 | -140/+0 | |
* | | | | | | | | | | | | | | | Merge pull request #5522 from MetaMask/fetch-debugging | Whymarrh Whitby | 2018-10-18 | 2 | -0/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | enable fetch debugging | kumavis | 2018-10-15 | 2 | -0/+37 | |
* | | | | | | | | | | | | | | | Adds toggle for primary currency (#5421) | Alexander Tseung | 2018-10-17 | 85 | -653/+2466 | |
* | | | | | | | | | | | | | | | Merge pull request #5534 from whymarrh/i18n-warnings | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Lower i18n-helper#getMessage log level from error to warning | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5535 from whymarrh/export-privkey-words | Whymarrh Whitby | 2018-10-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix wording of private key warning shown during export | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Update wording on export privkey modal | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5530 from whymarrh/fix-web3-inject-checks | Whymarrh Whitby | 2018-10-17 | 1 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix document extension check when injecting web3 | Whymarrh Whitby | 2018-10-16 | 1 | -7/+12 | |
* | | | | | | | | | | | | | | | Merge pull request #5529 from whymarrh/max-btn-click-area | Whymarrh Whitby | 2018-10-16 | 2 | -19/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Decrease click area for AmountMaxButton on send screen | Whymarrh Whitby | 2018-10-16 | 2 | -19/+24 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5528 from MetaMask/remove-greenkeeper-badge | Thomas Huang | 2018-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove greenkeeper badge from README | Thomas | 2018-10-16 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | add tooltip for view etherscan tx (#5518) | Michael J. Cohen | 2018-10-16 | 1 | -7/+10 | |
* | | | | | | | | | | | | | | | Merge pull request #5521 from MetaMask/deps-old-ethjs-fix | kumavis | 2018-10-16 | 2 | -92/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | deps - bump eth-token-tracker for ethjs-rpc bug in deps | kumavis | 2018-10-15 | 2 | -92/+70 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Improve Korean translations (#5515) | Noel Yoo | 2018-10-16 | 1 | -7/+85 | |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Fixed wrong Spanish translation of `key` (#5517) | Pedro Gutiérrez | 2018-10-16 | 1 | -7/+7 | |
* | | | | | | | | | | | | | | Add txReceipt data to transaction details (#5513) | Alexander Tseung | 2018-10-16 | 9 | -6/+126 | |
* | | | | | | | | | | | | | | Update Italian translations (#5502) | matteopey | 2018-10-16 | 2 | -5/+481 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for pending blockRef bugfix | kumavis | 2018-10-12 | 2 | -17/+31 | |
| | | * | | | | | | | | | | Merge pull request #5512 from MetaMask/v4.14.0 | Kevin Serrano | 2018-10-15 | 429 | -9291/+21575 | |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5511 from MetaMask/merge-master | kumavis | 2018-10-12 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into develop | kumavis | 2018-10-12 | 2 | -1/+4 | |
|/| | | | | | | | | | | | | | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #5384 from MetaMask/Version-4.13.0 | Dan Finlay | 2018-10-05 | 2 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Version 4.13.0v4.13.0 | Dan Finlay | 2018-09-28 | 2 | -2/+6 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Correct 4.14.0 version | Dan Finlay | 2018-10-12 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Merge pull request #5503 from whymarrh/fix-zendesk-links | Whymarrh Whitby | 2018-10-12 | 4 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Update Zendesk links for new subdomain | Whymarrh Whitby | 2018-10-12 | 4 | -4/+4 | |
* | | | | | | | | | | | | | | Merge pull request #5505 from MetaMask/Version-4.14.0 | Thomas Huang | 2018-10-12 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Version 4.14.0v4.14.0 | Dan Finlay | 2018-10-12 | 2 | -1/+4 | |
* | | | | | | | | | | | | | | | Fix en, ko locales (#5483) | Noel Yoo | 2018-10-11 | 2 | -49/+49 | |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #5494 from whymarrh/fix-seed-phrase-screen | Thomas Huang | 2018-10-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix styling of first-time-flow container | Whymarrh Whitby | 2018-10-11 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5491 from whymarrh/assert-new-tx-using-selected-address | Whymarrh Whitby | 2018-10-11 | 2 | -4/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Ensure that new transactions added are using the selected address | Whymarrh Whitby | 2018-10-11 | 2 | -4/+30 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5490 from whymarrh/revert-5375 | Whymarrh Whitby | 2018-10-11 | 1 | -23/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5... | Whymarrh Whitby | 2018-10-11 | 1 | -23/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | test - add actions unit tests (#5369) | Thomas Huang | 2018-10-10 | 5 | -141/+1643 | |
* | | | | | | | | | | | | | | Merge pull request #5480 from noelyoo/typo | kumavis | 2018-10-10 | 2 | -236/+236 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Alphabetize ko locale json keys | noelyoo | 2018-10-10 | 1 | -224/+224 | |
| * | | | | | | | | | | | | | | Alphabetize en locale json keys | noelyoo | 2018-10-10 | 1 | -12/+12 | |
* | | | | | | | | | | | | | | | transactions - add txReceipt to the txMeta body for confirmed txs (#5375) | Frankie | 2018-10-10 | 1 | -1/+23 |