| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | v4.9.2 | Thomas | 2018-08-10 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #5059 from MetaMask/e2e-tests-more-reliable | Dan J Miller | 2018-08-15 | 5 | -20/+45 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | Remove unnecessary else in test/e2e/beta/contract-test/contract.js | Dan Miller | 2018-08-15 | 1 | -1/+2 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Add explicit waits for submitted status for some txs initiated from test dapp. | Dan Miller | 2018-08-15 | 1 | -0/+7 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Reload e2e beta test browser if initial screen doesn't load. | Dan Miller | 2018-08-15 | 2 | -2/+16 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Increase timeout on wait for contract status update in metamask-beta-ui-spec | Dan Miller | 2018-08-15 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-bet... | Dan Miller | 2018-08-14 | 1 | -9/+9 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Make deployment states in test/e2e/beta/contract-test/contract.js more explicit | Dan Miller | 2018-08-14 | 2 | -5/+6 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.js | Dan Miller | 2018-08-14 | 1 | -5/+7 | |
| | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | | | | * | | fix merge conflicts | brunobar79 | 2018-08-18 | 49 | -2934/+1358 | |
| | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 | |
| | | | | | * | | | | | | | | | | | | | | | | | fix e2e tests | brunobar79 | 2018-08-17 | 1 | -1/+4 | |
| | | | | | * | | | | | | | | | | | | | | | | | ui ready | brunobar79 | 2018-08-17 | 4 | -11/+42 | |
| | | | | | * | | | | | | | | | | | | | | | | | connect screen ready | brunobar79 | 2018-08-17 | 5 | -32/+131 | |
| | | | | | * | | | | | | | | | | | | | | | | | change Metamask for MetaMask | brunobar79 | 2018-08-15 | 1 | -7/+1 | |
| | | | | | * | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-08-15 | 1 | -2/+3 | |
| | | | | | * | | | | | | | | | | | | | | | | | Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ... | brunobar79 | 2018-08-15 | 20 | -33/+66 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 20 | -33/+66 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #5060 from MetaMask/bignumber-string | Dan Finlay | 2018-08-15 | 3 | -4/+4 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | Cast arguments for new Bignumbers() to string. | Dan Miller | 2018-08-15 | 3 | -4/+4 | |
| | | | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Merge pull request #5058 from whymarrh/fix-words | Whymarrh Whitby | 2018-08-14 | 14 | -26/+26 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages | Whymarrh Whitby | 2018-08-14 | 9 | -11/+11 | |
| | | | | * | | | | | | | | | | | | | | | | | | | Fix casing of MetaMask in all localized messages | Whymarrh Whitby | 2018-08-14 | 11 | -16/+16 | |
| | | | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Merge pull request #4961 from whymarrh/download-seed-phrase | Whymarrh Whitby | 2018-08-14 | 3 | -3/+30 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | Add link to download seed words in new UI | Whymarrh Whitby | 2018-08-14 | 2 | -0/+27 | |
| | | | | * | | | | | | | | | | | | | | | | | | Add exportAsFile optional type argument | Whymarrh Whitby | 2018-08-14 | 1 | -2/+2 | |
| | | | | * | | | | | | | | | | | | | | | | | | Fix casing of 1Password | Whymarrh Whitby | 2018-08-14 | 1 | -1/+1 | |
| | | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | | | | * / / / / / / / / / / / / / / / / | use eth-ledger-bridge-keyring from npm | brunobar79 | 2018-08-15 | 1 | -1/+1 | |
| | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | remove console logs | brunobar79 | 2018-08-15 | 2 | -8/+2 | |
| | | | | * | | | | | | | | | | | | | | | | fixed unit tests | brunobar79 | 2018-08-15 | 2 | -5/+15 | |
| | | | | * | | | | | | | | | | | | | | | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 | |
| | | | | * | | | | | | | | | | | | | | | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | | | | | | ui fixes | brunobar79 | 2018-08-15 | 5 | -34/+46 | |
| | | | | * | | | | | | | | | | | | | | | | fix tx tests | brunobar79 | 2018-08-14 | 4 | -14/+25 | |
| | | | | * | | | | | | | | | | | | | | | | legacy and new hd path working | brunobar79 | 2018-08-14 | 5 | -25/+53 | |
| | | | | * | | | | | | | | | | | | | | | | good progress adding paths | brunobar79 | 2018-08-14 | 8 | -67/+140 | |
| | | | | * | | | | | | | | | | | | | | | | remove ledger lib | brunobar79 | 2018-08-12 | 1 | -1/+0 | |
| | | | | * | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-12 | 4 | -43/+4 | |
| | | | | * | | | | | | | | | | | | | | | | this should be ready to go | brunobar79 | 2018-08-12 | 4 | -323/+60 | |
| | | | | * | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-12 | 1 | -45/+36 | |
| | | | | * | | | | | | | | | | | | | | | | message signing works | brunobar79 | 2018-08-12 | 3 | -6/+19 | |
| | | | | * | | | | | | | | | | | | | | | | working | brunobar79 | 2018-08-12 | 2 | -24/+14 | |
| | | | | * | | | | | | | | | | | | | | | | tx signature is valid | brunobar79 | 2018-08-12 | 1 | -0/+1 | |
| | | | | * | | | | | | | | | | | | | | | | tx signing should work | brunobar79 | 2018-08-12 | 1 | -10/+39 | |
| | | | | * | | | | | | | | | | | | | | | | rename keyring | brunobar79 | 2018-08-11 | 2 | -1/+2 | |
| | | | | * | | | | | | | | | | | | | | | | able to add accounts | brunobar79 | 2018-08-11 | 4 | -40/+107 | |
| | | | | * | | | | | | | | | | | | | | | | iframe communication working | brunobar79 | 2018-08-11 | 8 | -67/+209 | |
| | | | | * | | | | | | | | | | | | | | | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 10 | -103/+247 | |
| | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 27 | -22/+662 | |
| | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | add comment | brunobar79 | 2018-08-09 | 1 | -0/+5 | |
| | | | * | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 4 | -32063/+32154 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | add submit button type | brunobar79 | 2018-08-09 | 1 | -0/+1 | |
| | | | * | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-08 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-08-08 | 1 | -4/+21 | |
| | | | * | | | | | | | | | | | | | | | | | code review changes | brunobar79 | 2018-08-08 | 5 | -12/+63 | |
| | | | * | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-08 | 39 | -1284/+1387 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | restore qr | brunobar79 | 2018-08-04 | 1 | -0/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-04 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | | | fixed issue with input | brunobar79 | 2018-08-04 | 3 | -2/+6 | |
| | | | * | | | | | | | | | | | | | | | | | | clear qr code data before scanning | brunobar79 | 2018-08-04 | 2 | -23/+25 | |
| | | | * | | | | | | | | | | | | | | | | | | design complete | brunobar79 | 2018-08-04 | 8 | -45/+166 | |
| | | | * | | | | | | | | | | | | | | | | | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 | |
| | | | * | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-01 | 1 | -15/+14 | |
| | | | * | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 | |
| | | | * | | | | | | | | | | | | | | | | | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 10 | -56/+179 | |
| | | | * | | | | | | | | | | | | | | | | | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 5 | -29/+48 | |
| | | | * | | | | | | | | | | | | | | | | | | kill camera stream when unmouting | brunobar79 | 2018-07-31 | 1 | -1/+4 | |
| | | | * | | | | | | | | | | | | | | | | | | copy | brunobar79 | 2018-07-31 | 2 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | clean up css | brunobar79 | 2018-07-31 | 3 | -30/+58 | |
| | | | * | | | | | | | | | | | | | | | | | | use existing modals | brunobar79 | 2018-07-31 | 12 | -235/+177 | |
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code... | brunobar79 | 2018-07-31 | 10 | -11/+100 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | fix unit tests | brunobar79 | 2018-07-27 | 1 | -0/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | fix dependencies | brunobar79 | 2018-07-27 | 3 | -4/+5 | |
| | | | * | | | | | | | | | | | | | | | | | | | fix linting errors | brunobar79 | 2018-07-27 | 4 | -4/+4 | |
| | | | * | | | | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-07-27 | 5 | -4/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | restore platform/extension.js | brunobar79 | 2018-07-27 | 1 | -5/+57 | |
| | | | * | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-27 | 28 | -55/+531 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | added webrtc-adapter for browser compat | brunobar79 | 2018-07-27 | 3 | -0/+24 | |
| | | | * | | | | | | | | | | | | | | | | | | | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 6 | -66/+7 | |
| | | | * | | | | | | | | | | | | | | | | | | | | working without permission issues | brunobar79 | 2018-07-27 | 4 | -44/+64 | |
| | | | * | | | | | | | | | | | | | | | | | | | | fix spinner and qr icon | brunobar79 | 2018-07-25 | 2 | -2/+6 | |
| | | | * | | | | | | | | | | | | | | | | | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 | |
| | | | * | | | | | | | | | | | | | | | | | | | | working without injection | brunobar79 | 2018-07-25 | 13 | -87/+231 | |
| | | | * | | | | | | | | | | | | | | | | | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 10 | -20/+29 | |
| | | | * | | | | | | | | | | | | | | | | | | | | camera working back and forth | brunobar79 | 2018-07-24 | 8 | -95/+116 | |
| | | | * | | | | | | | | | | | | | | | | | | | | fixes | brunobar79 | 2018-07-24 | 1 | -3/+3 | |
| | | | * | | | | | | | | | | | | | | | | | | | | added camera snippet injection to inpage.js | brunobar79 | 2018-07-24 | 1 | -0/+39 | |
| | | | * | | | | | | | | | | | | | | | | | | | | added instascan pkg | brunobar79 | 2018-07-24 | 2 | -7/+77 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1 | Dan Finlay | 2018-08-10 | 2 | -2/+48 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | tests for migration 28 | Esteban MIno | 2018-08-10 | 1 | -0/+46 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | fix migration 28 | Esteban MIno | 2018-08-10 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5022 from MetaMask/sentry-release-version | Jenny Pollack | 2018-08-10 | 2 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | sentry - change releaseVersion to release | Jenny Pollack | 2018-08-10 | 2 | -4/+4 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5017 from MetaMask/v4.9.1 | Dan Finlay | 2018-08-10 | 2 | -10/+21 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | v4.9.1 | Thomas | 2018-08-10 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Bump Changelog | Thomas | 2018-08-10 | 1 | -0/+6 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into develop | Thomas | 2018-08-10 | 4 | -0/+74 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Thomas | 2018-08-10 | 2 | -9/+14 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | remove duplicate template (#5016) | bobby dresser | 2018-08-10 | 1 | -17/+0 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Create issue templates (#4972) | bobby dresser | 2018-08-10 | 4 | -0/+74 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5010 from eduadiez/develop | Thomas Huang | 2018-08-10 | 1 | -3/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Avoid overwriting a domain that can be resolved by DNS | Eduardo Antuña DÃez | 2018-08-09 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Fixed ENS to IPFS functionality in Firefox | Eduardo Antuña DÃez | 2018-08-09 | 1 | -1/+1 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 2 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 2 | -2/+2 | |
| | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery | Dan J Miller | 2018-08-09 | 5 | -6/+51 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Fix lint error in tx-list | Whymarrh Whitby | 2018-08-09 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | | | | | Get nonce for showing retry button using ethQuery transaction count. | Dan Miller | 2018-08-09 | 5 | -6/+51 | |
| | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4986 from MetaMask/approve-calc-token-decimals | Dan J Miller | 2018-08-09 | 1 | -2/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Use token decimals when calculating confirm screen amount for token approvals. | Dan Miller | 2018-08-08 | 1 | -2/+8 | |
| | | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Update eth-keyring-controller and eth-hd-keyring versions (#4989) | Paul Bouchon | 2018-08-09 | 2 | -36072/+32114 | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4988 from MetaMask/remove-engine-restrictions | Bruno Barbieri | 2018-08-09 | 1 | -1/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | remove engine restrictions | brunobar79 | 2018-08-08 | 1 | -1/+0 | |
| | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4982 from MetaMask/sig-version-fix | Dan Finlay | 2018-08-08 | 2 | -1458/+5519 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Reestablish old versions of eth-keyring-controller and eth-hd-keyring | bitpshr | 2018-08-08 | 2 | -1458/+5519 | |
| | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Fixing translations in first-time init menu (#4969) | Justin Kat | 2018-08-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | * | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 4 | -22/+23 | |
| | | | | | | | | | | | | | | | | | | | | * | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 5 | -17/+24 | |
| | | | | | | | | | | | | | | | | | | | | * | WIP | Esteban MIno | 2018-08-17 | 3 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | * | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 3 | -13/+15 | |
| | | | | | | | | | | | | | | | | | | | | * | change watchAsset to new spec for type ERC20 | Esteban MIno | 2018-08-16 | 1 | -15/+27 | |
| | | | | | | | | | | | | | | | | | | | | * | add suggested tokens objects in metamask state | Esteban MIno | 2018-08-16 | 3 | -11/+20 | |
| | | | | | | | | | | | | | | | | | | | | * | watchToken to watchAsset | Esteban MIno | 2018-08-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | * | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 8 | -48/+70 | |
| | | | | | | | | | | | | | | | | | | | | * | update method to metamask_watchToken | Esteban MIno | 2018-08-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | * | show token address summary on old ui | Esteban MIno | 2018-08-08 | 1 | -10/+19 | |
| | | | | | | | | | | | | | | | | | | | | * | refactor unused code | Esteban MIno | 2018-08-08 | 6 | -18/+13 | |
| | | | | | | | | | | | | | | | | | | | | * | fix merge | Esteban MIno | 2018-08-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | * | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 38 | -1284/+1388 | |
| | | | | | | | | | | | | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge pull request #4884 from MetaMask/TokensPerAccountBasis | Dan Finlay | 2018-08-08 | 9 | -37/+287 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | CHANGELOG | Esteban MIno | 2018-08-08 | 1 | -0/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 1 | -0/+2 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4965 from MetaMask/4.9.0v4.9.0 | Dan Finlay | 2018-08-08 | 1 | -0/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Update CHANGELOG.md | Kevin Serrano | 2018-08-08 | 1 | -0/+2 | |
| | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 34 | -1259/+1149 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge pull request #4960 from whymarrh/import-account-error | Whymarrh Whitby | 2018-08-07 | 2 | -2/+10 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Show invalid seed phrase error when importing new account | Whymarrh Whitby | 2018-08-07 | 2 | -2/+10 | |
| | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge pull request #4951 from whymarrh/update-pkgs | Whymarrh Whitby | 2018-08-07 | 3 | -547/+124 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Update chromedriver pkg | Whymarrh Whitby | 2018-08-07 | 2 | -20/+23 | |
| | | | * | | | | | | | | | | | | | | | | | | | Switch superstatic for static-server pkg | Whymarrh Whitby | 2018-08-07 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | Add static-server devDependency | Whymarrh Whitby | 2018-08-07 | 2 | -7/+88 | |
| | | | * | | | | | | | | | | | | | | | | | | | Remove superstatic package | Whymarrh Whitby | 2018-08-07 | 2 | -524/+26 | |
| | | | * | | | | | | | | | | | | | | | | | | | Refresh package-lock.json file with npm@6.3.0 | Whymarrh Whitby | 2018-08-07 | 1 | -15/+6 | |
| | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge pull request #4868 from MetaMask/further-e2e-improvements | Dan J Miller | 2018-08-07 | 5 | -64/+47 | |
| | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Fix seed word confirmation step of e2e beta tests. | Dan Miller | 2018-08-06 | 2 | -60/+29 | |
| | | * | | | | | | | | | | | | | | | | | | | Use unmodified constant for test delay in from-import-beta-spec. | Dan Miller | 2018-08-06 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | Improve waits for new tx-list-items after first contract method call in e2e b... | Dan Miller | 2018-08-06 | 3 | -3/+17 | |
| | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 3 | -5/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 3 | -5/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4947 from MetaMask/i4532-disable-confirm-onsubmit | Alexander Tseung | 2018-08-04 | 2 | -6/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 2 | -6/+21 | |
| | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4906 from MetaMask/updatePhishingPage | Kevin Serrano | 2018-08-03 | 1 | -23/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Update Phishing Html | Thomas | 2018-07-28 | 1 | -23/+26 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4926 from MetaMask/update-logic-for-retry-button | Dan J Miller | 2018-08-01 | 2 | -8/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Show the retry button on latest tx of earliest nonce. | Dan Miller | 2018-08-01 | 2 | -8/+8 | |
| | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4888 from whymarrh/suggest-new-ui | Whymarrh Whitby | 2018-08-01 | 12 | -591/+861 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Remove the development notice from UI onboarding | Whymarrh Whitby | 2018-07-28 | 1 | -20/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | Open UI in browser post-new-UI-switch | Whymarrh Whitby | 2018-07-28 | 2 | -0/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | Don't show an additional beta UI notification | Whymarrh Whitby | 2018-07-28 | 4 | -12/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | New ui e2e tests switch to localhost provider (needed after new ui selection ... | Dan Miller | 2018-07-28 | 2 | -0/+20 | |
| | | * | | | | | | | | | | | | | | | | | | | Fix integration tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 1 | -0/+5 | |
| | | * | | | | | | | | | | | | | | | | | | | Fix e2e tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 3 | -57/+83 | |
| | | * | | | | | | | | | | | | | | | | | | | Rewrite AccountQrScreen to use flexbox | Whymarrh Whitby | 2018-07-28 | 4 | -108/+92 | |
| | | * | | | | | | | | | | | | | | | | | | | Remove suggestion from bottom of old UI onboarding | Whymarrh Whitby | 2018-07-28 | 1 | -16/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | Add NewUiAnnouncement component | Whymarrh Whitby | 2018-07-28 | 4 | -9/+216 | |
| | | * | | | | | | | | | | | | | | | | | | | Add banner suggesting new UI | Whymarrh Whitby | 2018-07-28 | 2 | -2/+64 | |
| | | * | | | | | | | | | | | | | | | | | | | Move the old UI's AppBar into its own component | Whymarrh Whitby | 2018-07-28 | 3 | -384/+394 | |
| | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4908 from MetaMask/npm-install | William Morriss | 2018-07-31 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Select not Update | William Morriss | 2018-07-31 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | reduce npm install to one line | William Morriss | 2018-07-28 | 1 | -4/+1 | |
| | | * | | | | | | | | | | | | | | | | | | restore npm install instructions | William Morriss | 2018-07-28 | 1 | -1/+5 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | fix doc tag | Esteban MIno | 2018-08-01 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | tokens related functions refactor | Esteban MIno | 2018-08-01 | 1 | -15/+22 | |
| | | | * | | | | | | | | | | | | | | | | fix undefined for tokens on tests | Esteban MIno | 2018-08-01 | 1 | -1/+3 | |
| | | | * | | | | | | | | | | | | | | | | improve comments | Esteban MIno | 2018-07-31 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | fix double state update when account changed | Esteban MIno | 2018-07-31 | 1 | -5/+3 | |
| | | | * | | | | | | | | | | | | | | | | create tokens storage when setadresses | Esteban MIno | 2018-07-31 | 2 | -2/+29 | |
| | | | * | | | | | | | | | | | | | | | | isolation of tokens related methods in preferences | Esteban MIno | 2018-07-31 | 1 | -43/+42 | |
| | | | * | | | | | | | | | | | | | | | | passing tokens to all accounts in migration | Esteban MIno | 2018-07-30 | 1 | -3/+6 | |
| | | | * | | | | | | | | | | | | | | | | unit tests for tokens per account and network | Esteban MIno | 2018-07-28 | 1 | -0/+128 | |
| | | | * | | | | | | | | | | | | | | | | fix migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 18 | -18/+439 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | refactor to accountTokens | Esteban MIno | 2018-07-28 | 2 | -54/+48 | |
| | | | * | | | | | | | | | | | | | | | | | migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 2 | -0/+38 | |
| | | | * | | | | | | | | | | | | | | | | | modify tests according to tokens by network | Esteban MIno | 2018-07-27 | 2 | -18/+8 | |
| | | | * | | | | | | | | | | | | | | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 2 | -11/+10 | |
| | | | * | | | | | | | | | | | | | | | | | tokens per network for individual account | Esteban MIno | 2018-07-27 | 2 | -15/+52 | |
| | | | * | | | | | | | | | | | | | | | | | preferences test fixes for tokens per account | Esteban MIno | 2018-07-26 | 1 | -9/+16 | |
| | | | * | | | | | | | | | | | | | | | | | add & delete tokens per account | Esteban MIno | 2018-07-26 | 2 | -8/+27 | |
| | | | | | | | | | | | | | | | | | | | * | watch token on old ui | Esteban MIno | 2018-08-08 | 5 | -0/+221 | |
| | | | | | | | | | | | | | | | | | | | * | wip watch token old ui | Esteban MIno | 2018-08-08 | 2 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | * | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 | |
| | | | | | | | | | | | | | | | | | | | * | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 8 | -12/+164 | |
| | | | | | | | | | | | | | | | | | | | * | fix duplicated action | Esteban MIno | 2018-08-07 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | * | add suggested token params validation | Esteban MIno | 2018-08-07 | 1 | -4/+25 | |
| | | | | | | | | | | | | | | | | | | | * | eth_watchToken working | Esteban MIno | 2018-08-04 | 6 | -3/+42 | |
| | | | | | | | | | | | | | | | | | | | * | popup initializing with suggested tokens | Esteban MIno | 2018-08-04 | 1 | -6/+2 | |
| | | | | | | | | | | | | | | | | | | | * | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 2 | -9/+4 | |
| | | | | | | | | | | | | | | | | | | | * | merge develop | Esteban MIno | 2018-08-04 | 477 | -36307/+43909 | |
| | | | | | | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4895 from MetaMask/fix-confirm | Alexander Tseung | 2018-07-28 | 4 | -6/+30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 3 | -6/+23 | |
| | | * | | | | | | | | | | | | | | | | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 | |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecation | Dan Finlay | 2018-07-28 | 2 | -6/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Add deprecation message for eth_signTypedData | bitpshr | 2018-07-28 | 2 | -6/+20 | |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4893 from kelvintyb/develop | Thomas Huang | 2018-07-28 | 4 | -3/+65 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | revert package-lock.json | Kelvin Tan | 2018-07-27 | 1 | -19/+36 | |
| | | * | | | | | | | | | | | | | | | | | | add phishing html page, and redirect to bundled page in-window | Kelvin Tan | 2018-07-27 | 5 | -39/+84 | |
| | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge pull request #4901 from MetaMask/readme-update | Bruno Barbieri | 2018-07-28 | 1 | -2/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | remove Web Store warning | bobby dresser | 2018-07-28 | 1 | -2/+0 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional | kumavis | 2018-07-27 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Update Chinese naming | Kevin Serrano | 2018-07-24 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | Merge pull request #4802 from 03-26/develop | kumavis | 2018-07-27 | 1 | -4/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 3 | -12/+40 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 209 | -2684/+3377 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Update | 03-26 | 2018-07-15 | 1 | -4/+29 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 2 | -2/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | earliest tx by submittedTime | Esteban MIno | 2018-07-26 | 2 | -10/+16 | |
| | | * | | | | | | | | | | | | | | | | | | | | only show retry button on earliest pending tx | Esteban MIno | 2018-07-26 | 2 | -2/+14 | |
| | | | |_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRow | Dan J Miller | 2018-07-26 | 1 | -0/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | lint fix | Sara Reynolds | 2018-07-26 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | | Update prop names | Sara Reynolds | 2018-07-26 | 1 | -7/+7 | |
| | | * | | | | | | | | | | | | | | | | | | | | Add tests for Confirm Detail Row | Sara Reynolds | 2018-07-26 | 1 | -0/+64 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gas | Frankie | 2018-07-26 | 1 | -7/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | tx-gas-utils - catch all errors from gas estimation | Jenny Pollack | 2018-07-25 | 1 | -7/+3 | |
| | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4875 from MetaMask/bmd/readme-release | Dan Finlay | 2018-07-26 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | remove current version | bobby dresser | 2018-07-26 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | fix link bracket | bobby dresser | 2018-07-26 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | add current release to the README | bobby dresser | 2018-07-26 | 1 | -0/+2 | |
| | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4880 from MetaMask/migration-27 | Thomas Huang | 2018-07-26 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | migrations - fix to include 27 | frankiebee | 2018-07-26 | 1 | -0/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamer | William Morriss | 2018-07-25 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into no-inject-ani-gamer | Kevin Serrano | 2018-07-25 | 58 | -437/+2919 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw | Dan Finlay | 2018-07-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4820 from MetaMask/codeowners | William Morriss | 2018-07-25 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Added codeowners file | Dan Finlay | 2018-07-18 | 1 | -0/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4845 from MetaMask/button-group | Dan J Miller | 2018-07-25 | 6 | -0/+248 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Adds tests for button group component. | Dan Miller | 2018-07-24 | 1 | -0/+97 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Add ButtonGroup component | Alexander Tseung | 2018-07-24 | 5 | -0/+151 | |
| | * | | | | | | | | | | | | | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 2 | -0/+4 | |
| | | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-ui | Alexander Tseung | 2018-07-25 | 7 | -18/+111 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Remove unneeded code from i4829-close-notifications-from-ui branch. | Dan Miller | 2018-07-25 | 2 | -2/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Uncomment closePopupIfOpen code. | Dan Miller | 2018-07-24 | 1 | -3/+3 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Updates e2e beta tests to ensure that popup window closes after confirming a ... | Dan Miller | 2018-07-24 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 5 | -31/+108 | |
| | | * | | | | | | | | | | | | | | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 3 | -8/+25 | |
| | | | |_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * / | | | | | | | | | | | | | | | | | | | | Update Babel to Current Standard "babel-preset-env" (#4812) | Antoine Nauleau | 2018-07-25 | 3 | -25/+43 | |
| | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge pull request #4851 from MetaMask/fix-trezor-alert | Dan Finlay | 2018-07-24 | 1 | -4/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4848 from MetaMask/fix-alert-flash | Dan Finlay | 2018-07-24 | 3 | -8/+48 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | run linter | brunobar79 | 2018-07-22 | 2 | -2/+2 | |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) |
| aboutsummaryrefslogtreecommitdiffstats |