aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1567-428/+1461
|\ | | | | | | Override package-lock and fix merge conflicts
| * Merge pull request #5058 from whymarrh/fix-wordsWhymarrh Whitby2018-08-1414-26/+26
| |\ | | | | | | Fix casing of some proper nouns in localised messages
| | * Fix casing of Bitcoin, Ethereum, and Litecoin across localized messagesWhymarrh Whitby2018-08-149-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the following commands: sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete
| | * Fix casing of MetaMask in all localized messagesWhymarrh Whitby2018-08-1411-16/+16
| | | | | | | | | | | | | | | | | | | | | Using the following: sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete
| * | Merge pull request #4961 from whymarrh/download-seed-phraseWhymarrh Whitby2018-08-143-3/+30
| |\ \ | | |/ | |/| Add download seed phrase link to new UI
| | * Add link to download seed words in new UIWhymarrh Whitby2018-08-142-0/+27
| | |
| | * Add exportAsFile optional type argumentWhymarrh Whitby2018-08-141-2/+2
| | |
| | * Fix casing of 1PasswordWhymarrh Whitby2018-08-141-1/+1
| |/
| * Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-1127-22/+662
| |\ | | | | | | QR Code Scanner
| | * add commentbrunobar792018-08-091-0/+5
| | |
| | * fix merge conflictsbrunobar792018-08-094-32063/+32154
| | |\
| | * | add submit button typebrunobar792018-08-091-0/+1
| | | |
| | * | lintbrunobar792018-08-081-1/+1
| | | |
| | * | update package-lock.jsonbrunobar792018-08-081-4/+21
| | | |
| | * | code review changesbrunobar792018-08-085-12/+63
| | | |
| | * | fix merge conflictsbrunobar792018-08-0839-1284/+1387
| | |\ \
| | * | | restore qrbrunobar792018-08-041-0/+2
| | | | |
| | * | | lintbrunobar792018-08-041-1/+1
| | | | |
| | * | | fixed issue with inputbrunobar792018-08-043-2/+6
| | | | |
| | * | | clear qr code data before scanningbrunobar792018-08-042-23/+25
| | | | |
| | * | | design completebrunobar792018-08-048-45/+166
| | | | |
| | * | | fixbrunobar792018-08-011-1/+6
| | | | |
| | * | | lintbrunobar792018-08-011-15/+14
| | | | |
| | * | | lintbrunobar792018-08-011-2/+0
| | | | |
| | * | | added crossbrowser support and error handlingbrunobar792018-08-0110-56/+179
| | | | |
| | * | | send to fullscreen if no permission from popupbrunobar792018-07-315-29/+48
| | | | |
| | * | | kill camera stream when unmoutingbrunobar792018-07-311-1/+4
| | | | |
| | * | | copybrunobar792018-07-312-2/+2
| | | | |
| | * | | clean up cssbrunobar792018-07-313-30/+58
| | | | |
| | * | | use existing modalsbrunobar792018-07-3112-235/+177
| | | | |
| | * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-3110-11/+100
| | |\ \ \ | | | | | | | | | | | | | | | | | | qr-code-scan
| | * | | | fix unit testsbrunobar792018-07-271-0/+2
| | | | | |
| | * | | | fix dependenciesbrunobar792018-07-273-4/+5
| | | | | |
| | * | | | fix linting errorsbrunobar792018-07-274-4/+4
| | | | | |
| | * | | | clean upbrunobar792018-07-275-4/+2
| | | | | |
| | * | | | restore platform/extension.jsbrunobar792018-07-271-5/+57
| | | | | |
| | * | | | fix merge conflictsbrunobar792018-07-2728-55/+531
| | |\ \ \ \
| | * | | | | added webrtc-adapter for browser compatbrunobar792018-07-273-0/+24
| | | | | | |
| | * | | | | fully working without tweaking ext. permissionbrunobar792018-07-276-66/+7
| | | | | | |
| | * | | | | working without permission issuesbrunobar792018-07-274-44/+64
| | | | | | |
| | * | | | | fix spinner and qr iconbrunobar792018-07-252-2/+6
| | | | | | |
| | * | | | | decent UIbrunobar792018-07-251-21/+43
| | | | | | |
| | * | | | | working without injectionbrunobar792018-07-2513-87/+231
| | | | | | |
| | * | | | | added qr code scanner icon in send transactionbrunobar792018-07-2410-20/+29
| | | | | | |
| | * | | | | camera working back and forthbrunobar792018-07-248-95/+116
| | | | | | |
| | * | | | | fixesbrunobar792018-07-241-3/+3
| | | | | | |
| | * | | | | added camera snippet injection to inpage.jsbrunobar792018-07-241-0/+39
| | | | | | |
| | * | | | | added instascan pkgbrunobar792018-07-242-7/+77
| | | | | | |
| * | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1Dan Finlay2018-08-102-2/+48
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes migration 28
| | * | | | | | tests for migration 28Esteban MIno2018-08-101-0/+46
| | | | | | | |
| | * | | | | | fix migration 28Esteban MIno2018-08-101-2/+2
| | | | | | | |
| * | | | | | | Merge pull request #5022 from MetaMask/sentry-release-versionJenny Pollack2018-08-102-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | sentry - change releaseVersion to release
| | * | | | | | sentry - change releaseVersion to releaseJenny Pollack2018-08-102-4/+4
| |/ / / / / /
| * | | | | | Merge pull request #5017 from MetaMask/v4.9.1Dan Finlay2018-08-102-10/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | V4.9.1
| | * | | | | | v4.9.1Thomas2018-08-101-1/+1
| | | | | | | |
| | * | | | | | Bump ChangelogThomas2018-08-101-0/+6
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into developThomas2018-08-104-0/+74
| | |\ \ \ \ \ \
| | * | | | | | | Merge branch 'master' into developThomas2018-08-102-9/+14
| | | | | | | | |
| * | | | | | | | remove duplicate template (#5016)bobby dresser2018-08-101-17/+0
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Create issue templates (#4972)bobby dresser2018-08-104-0/+74
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | adds issue templates
| * | | | | | Merge pull request #5010 from eduadiez/developThomas Huang2018-08-101-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ENS resolution issues
| | * | | | | | Avoid overwriting a domain that can be resolved by DNSEduardo Antuña Díez2018-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it. changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
| | * | | | | | Fixed ENS to IPFS functionality in FirefoxEduardo Antuña Díez2018-08-091-1/+1
| |/ / / / / / | | | | | | | | | | | | | | `tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
| * | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failureDan J Miller2018-08-092-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Show error while allowing confirmation of tx where simulation fails
| | * | | | | | Show error while allowing confirmation of transaction where simulation failsDan Miller2018-08-092-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethqueryDan J Miller2018-08-095-6/+51
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Get nonce for showing retry button using ethQuery transaction count.
| | * | | | | Fix lint error in tx-listWhymarrh Whitby2018-08-091-1/+1
| | | | | | |
| | * | | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-095-6/+51
| |/ / / / /
| * | | | | Merge pull request #4986 from MetaMask/approve-calc-token-decimalsDan J Miller2018-08-091-2/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | Use token decimals when calculating confirm screen token approval amount
| | * | | | | Use token decimals when calculating confirm screen amount for token approvals.Dan Miller2018-08-081-2/+8
| | | |_|_|/ | | |/| | |
| * | | | | Update eth-keyring-controller and eth-hd-keyring versions (#4989)Paul Bouchon2018-08-092-36072/+32114
| | | | | |
| * | | | | Merge pull request #4988 from MetaMask/remove-engine-restrictionsBruno Barbieri2018-08-091-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove engine restrictions
| | * | | | | remove engine restrictionsbrunobar792018-08-081-1/+0
| |/ / / / /
| * | | | | Merge pull request #4982 from MetaMask/sig-version-fixDan Finlay2018-08-082-1458/+5519
| |\ \ \ \ \ | | |/ / / / | |/| | | | Reestablish old versions of eth-keyring-controller and eth-hd-keyring
| | * | | | Reestablish old versions of eth-keyring-controller and eth-hd-keyringbitpshr2018-08-082-1458/+5519
| |/ / / /
| * | | | Fixing translations in first-time init menu (#4969)Justin Kat2018-08-081-1/+1
| | | | |
| * | | | Merge pull request #4884 from MetaMask/TokensPerAccountBasisDan Finlay2018-08-089-37/+287
| |\ \ \ \ | | | | | | | | | | | | Tokens per account & network basis
| | * | | | CHANGELOGEsteban MIno2018-08-081-0/+2
| | | | | |
| | * | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-081-0/+2
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4965 from MetaMask/4.9.0v4.9.0Dan Finlay2018-08-081-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Update CHANGELOG.md
| | * | | | | Update CHANGELOG.mdKevin Serrano2018-08-081-0/+2
| |/ / / / /
| | * | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-0834-1259/+1149
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix doc tagEsteban MIno2018-08-011-1/+1
| | | | | |
| | * | | | tokens related functions refactorEsteban MIno2018-08-011-15/+22
| | | | | |
| | * | | | fix undefined for tokens on testsEsteban MIno2018-08-011-1/+3
| | | | | |
| | * | | | improve commentsEsteban MIno2018-07-311-1/+1
| | | | | |
| | * | | | fix double state update when account changedEsteban MIno2018-07-311-5/+3
| | | | | |
| | * | | | create tokens storage when setadressesEsteban MIno2018-07-312-2/+29
| | | | | |
| | * | | | isolation of tokens related methods in preferencesEsteban MIno2018-07-311-43/+42
| | | | | |
| | * | | | passing tokens to all accounts in migrationEsteban MIno2018-07-301-3/+6
| | | | | |
| | * | | | unit tests for tokens per account and networkEsteban MIno2018-07-281-0/+128
| | | | | |
| | * | | | fix migration for preferences controller tokensEsteban MIno2018-07-281-1/+1
| | | | | |
| | * | | | Merge branch 'develop' into TokensPerAccountBasisEsteban Miño2018-07-2818-18/+439
| | |\ \ \ \
| | * | | | | refactor to accountTokensEsteban MIno2018-07-282-54/+48
| | | | | | |
| | * | | | | migration for preferences controller tokensEsteban MIno2018-07-282-0/+38
| | | | | | |
| | * | | | | modify tests according to tokens by networkEsteban MIno2018-07-272-18/+8
| | | | | | |
| | * | | | | add & delete tokens per networkEsteban MIno2018-07-272-11/+10
| | | | | | |
| | * | | | | tokens per network for individual accountEsteban MIno2018-07-272-15/+52
| | | | | | |
| | * | | | | preferences test fixes for tokens per accountEsteban MIno2018-07-261-9/+16
| | | | | | |
| | * | | | | add & delete tokens per accountEsteban MIno2018-07-262-8/+27
| | | | | | |
* | | | | | | Confirms new contract token in the popupThomas2018-08-141-6/+6
| | | | | | |
* | | | | | | DelayThomas2018-08-091-0/+1
| | | | | | |
* | | | | | | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| | | | | | |
* | | | | | | Use develop e2e beta testsThomas2018-08-081-109/+34
| | | | | | |
* | | | | | | Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-08-081-32211/+32287
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into network-remove-provider-engine
| * | | | | | | deps - update package-lockfrankiebee2018-08-071-32211/+32287
| | | | | | | |
* | | | | | | | lint fixesfrankiebee2018-08-081-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-08-0718-598/+235
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into network-remove-provider-engine-tests
| * | | | | | Merge pull request #4960 from whymarrh/import-account-errorWhymarrh Whitby2018-08-072-2/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Show invalid seed phrase error when importing new account
| | * | | | | | Show invalid seed phrase error when importing new accountWhymarrh Whitby2018-08-072-2/+10
| |/ / / / / /
| * | | | | | Merge pull request #4951 from whymarrh/update-pkgsWhymarrh Whitby2018-08-073-547/+124
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update e2e test packages 📦
| | * | | | | | Update chromedriver pkgWhymarrh Whitby2018-08-072-20/+23
| | | | | | | |
| | * | | | | | Switch superstatic for static-server pkgWhymarrh Whitby2018-08-071-2/+2
| | | | | | | |
| | * | | | | | Add static-server devDependencyWhymarrh Whitby2018-08-072-7/+88
| | | | | | | |
| | * | | | | | Remove superstatic packageWhymarrh Whitby2018-08-072-524/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install and uninstalling superstatic doesn't work on Node 8 at the time of writing: $ npm install -D superstatic@6 npm ERR! code ENOTSUP npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"}) npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1 npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1 npm ERR! notsup Required: {"node":">=0.10.0 <7"} npm ERR! notsup Actual: {"npm":"6.3.0","node":"8.11.3"} This commit removes the package (using Node 6!) and it will have to be replaced.
| | * | | | | | Refresh package-lock.json file with npm@6.3.0Whymarrh Whitby2018-08-071-15/+6
| |/ / / / / /
| * | | | | | Merge pull request #4868 from MetaMask/further-e2e-improvementsDan J Miller2018-08-075-64/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Further new ui e2e test improvements
| | * | | | | | Fix seed word confirmation step of e2e beta tests.Dan Miller2018-08-062-60/+29
| | | | | | | |
| | * | | | | | Use unmodified constant for test delay in from-import-beta-spec.Dan Miller2018-08-061-1/+1
| | | | | | | |
| | * | | | | | Improve waits for new tx-list-items after first contract method call in e2e ↵Dan Miller2018-08-063-3/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | beta tests.
| * | | | | | Merge pull request #4948 from MetaMask/i4638-update-fontAlexander Tseung2018-08-043-5/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update Font in Account Selector
| | * | | | | | Update Font in Account SelectorAlexander Tseung2018-08-043-5/+0
| | | | | | | |
| * | | | | | | Merge pull request #4947 from MetaMask/i4532-disable-confirm-onsubmitAlexander Tseung2018-08-042-6/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Disable Confirm button on subsequent clicks to prevent confirming mul…
| | * | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple timesAlexander Tseung2018-08-042-6/+21
| |/ / / / / /
| * | | | | | Merge pull request #4906 from MetaMask/updatePhishingPageKevin Serrano2018-08-031-23/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update Phishing HTML
| | * | | | | | Update Phishing HtmlThomas2018-07-281-23/+26
| | | | | | | |
| * | | | | | | Merge pull request #4926 from MetaMask/update-logic-for-retry-buttonDan J Miller2018-08-012-8/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Show the retry button on latest tx of earliest nonce.
| | * | | | | | | Show the retry button on latest tx of earliest nonce.Dan Miller2018-08-012-8/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'network-remove-provider-engine' into ↵frankiebee2018-08-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine-tests
| * | | | | | | | network - fix blockTracker reference to return the blockTrackerProxy instead ↵frankiebee2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the direct blockTracker reference
* | | | | | | | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-0229-695/+1203
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #4888 from whymarrh/suggest-new-uiWhymarrh Whitby2018-08-0112-591/+861
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add old UI component to suggest new UI
| | * | | | | | | | Remove the development notice from UI onboardingWhymarrh Whitby2018-07-281-20/+0
| | | | | | | | | |
| | * | | | | | | | Open UI in browser post-new-UI-switchWhymarrh Whitby2018-07-282-0/+2
| | | | | | | | | |
| | * | | | | | | | Don't show an additional beta UI notificationWhymarrh Whitby2018-07-284-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user has opted-in to the new UI from the announcement, we don't need an additional notification letting the user know that they've switched.
| | * | | | | | | | New ui e2e tests switch to localhost provider (needed after new ui selection ↵Dan Miller2018-07-282-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen addition).
| | * | | | | | | | Fix integration tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-281-0/+5
| | | | | | | | | |
| | * | | | | | | | Fix e2e tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-283-57/+83
| | | | | | | | | |
| | * | | | | | | | Rewrite AccountQrScreen to use flexboxWhymarrh Whitby2018-07-284-108/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old QR screen was absolutely positioning everything which broke when the app bar resized for the new UI announcement. This change, while futile*, makes the QR screen less bad. * futile because the old UI is being deprecated
| | * | | | | | | | Remove suggestion from bottom of old UI onboardingWhymarrh Whitby2018-07-281-16/+0
| | | | | | | | | |
| | * | | | | | | | Add NewUiAnnouncement componentWhymarrh Whitby2018-07-284-9/+216
| | | | | | | | | |
| | * | | | | | | | Add banner suggesting new UIWhymarrh Whitby2018-07-282-2/+64
| | | | | | | | | |
| | * | | | | | | | Move the old UI's AppBar into its own componentWhymarrh Whitby2018-07-283-384/+394
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #4908 from MetaMask/npm-installWilliam Morriss2018-07-311-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Restore npm install instructions to README
| | * | | | | | | Select not UpdateWilliam Morriss2018-07-311-1/+1
| | | | | | | | |
| | * | | | | | | reduce npm install to one lineWilliam Morriss2018-07-281-4/+1
| | | | | | | | |
| | * | | | | | | restore npm install instructionsWilliam Morriss2018-07-281-1/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #4895 from MetaMask/fix-confirmAlexander Tseung2018-07-284-6/+30
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Add rounding to large exponential numbers. Fix overflows
| | * | | | | | Round large exponential numbersAlexander Tseung2018-07-283-6/+23
| | | | | | | |
| | * | | | | | Fix overflow for long total strings in confirm stringAlexander Tseung2018-07-261-0/+7
| | | | | | | |
| * | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecationDan Finlay2018-07-282-6/+20
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | EIP-712: deprecation message
| | * | | | | | Add deprecation message for eth_signTypedDatabitpshr2018-07-282-6/+20
| | | | | | | |
| * | | | | | | Merge pull request #4893 from kelvintyb/developThomas Huang2018-07-284-3/+65
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Move phishing warning to the extension
| | * | | | | | revert package-lock.jsonKelvin Tan2018-07-271-19/+36
| | | | | | | |
| | * | | | | | add phishing html page, and redirect to bundled page in-windowKelvin Tan2018-07-275-39/+84
| | |/ / / / /
| * | | | | | Merge pull request #4901 from MetaMask/readme-updateBruno Barbieri2018-07-281-2/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | remove Web Store warning
| | * | | | | remove Web Store warningbobby dresser2018-07-281-2/+0
| |/ / / / /
| * | | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditionalkumavis2018-07-271-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Update Chinese naming on our language list
| | * | | | | Update Chinese namingKevin Serrano2018-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | I sincerely hope this is a non-controversial change.
| * | | | | | Merge pull request #4802 from 03-26/developkumavis2018-07-271-4/+29
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Update translation 🇯🇵
| | * | | | | Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-213-12/+40
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-21209-2684/+3377
| | |\ \ \ \ \ \
| | * | | | | | | Update03-262018-07-151-4/+29
| | | | | | | | |
| * | | | | | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTxDan J Miller2018-07-262-2/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Only show retry button on the earliest pending tx
| | * | | | | | | | earliest tx by submittedTimeEsteban MIno2018-07-262-10/+16
| | | | | | | | | |
| | * | | | | | | | only show retry button on earliest pending txEsteban MIno2018-07-262-2/+14
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRowDan J Miller2018-07-261-0/+64
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add tests for Confirm Detail Row
| | * | | | | | | | lint fixSara Reynolds2018-07-261-2/+2
| | | | | | | | | |
| | * | | | | | | | Update prop namesSara Reynolds2018-07-261-7/+7
| | | | | | | | | |
| | * | | | | | | | Add tests for Confirm Detail RowSara Reynolds2018-07-261-0/+64
| | | | | | | | | |
| * | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | tx-gas-utils - catch all errors from gas estimation
| | * | | | | | | | | tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | LintThomas Huang2018-07-311-2/+2
| | | | | | | | | |
* | | | | | | | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| | | | | | | | | |
* | | | | | | | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| | | | | | | | | |
* | | | | | | | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| | | | | | | | | |
* | | | | | | | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-26355-3796/+10262
|\| | | | | | | | | | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge pull request #4875 from MetaMask/bmd/readme-releaseDan Finlay2018-07-261-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add current release to the README
| | * | | | | | | | remove current versionbobby dresser2018-07-261-1/+1
| | | | | | | | | |
| | * | | | | | | | fix link bracketbobby dresser2018-07-261-1/+1
| | | | | | | | | |
| | * | | | | | | | add current release to the READMEbobby dresser2018-07-261-0/+2
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #4880 from MetaMask/migration-27Thomas Huang2018-07-261-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | migrations - fix to include 27
| | * | | | | | | migrations - fix to include 27frankiebee2018-07-261-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamerWilliam Morriss2018-07-251-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw
| | * \ \ \ \ \ \ Merge branch 'develop' into no-inject-ani-gamerKevin Serrano2018-07-2558-437/+2919
| | |\ \ \ \ \ \ \
| | * | | | | | | | Do not inject on ani.gamer.com.twDan Finlay2018-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4799
| * | | | | | | | | Merge pull request #4820 from MetaMask/codeownersWilliam Morriss2018-07-251-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added codeowners file
| | * | | | | | | | | Added codeowners fileDan Finlay2018-07-181-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #4845 from MetaMask/button-groupDan J Miller2018-07-256-0/+248
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | Add ButtonGroup component
| | * | | | | | | | | Adds tests for button group component.Dan Miller2018-07-241-0/+97
| | | | | | | | | | |
| | * | | | | | | | | Add ButtonGroup componentAlexander Tseung2018-07-245-0/+151
| | | | | | | | | | |
| * | | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-252-0/+4
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | Fixes #4253
| * | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-uiAlexander Tseung2018-07-257-18/+111
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Close notifications from UI actions
| | * | | | | | | | | Remove unneeded code from i4829-close-notifications-from-ui branch.Dan Miller2018-07-252-2/+1
| | | | | | | | | | |
| | * | | | | | | | | Uncomment closePopupIfOpen code.Dan Miller2018-07-241-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Updates e2e beta tests to ensure that popup window closes after confirming a ↵Dan Miller2018-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple send.
| | * | | | | | | | | Add close window support to signature requests. Move logic to actionsAlexander Tseung2018-07-245-31/+108
| | | | | | | | | | |
| | * | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-243-8/+25
| | | |_|_|/ / / / / | | |/| | | | | | |
| * / | | | | | | | Update Babel to Current Standard "babel-preset-env" (#4812)Antoine Nauleau2018-07-253-25/+43
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update .babelrc and package.json to babel-preset-env standard * Install babel-preset-env babel-stage-0 * Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix * Resolve PR #4812 merge conflicts * Merge #4847 Solves previous cache issues with cirlce-ci
| * | | | | | | | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix trezor "Hardware wallet connected" alert
| | * | | | | | | | show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
| | | | | | | | | |
| * | | | | | | | | Merge pull request #4848 from MetaMask/fix-alert-flashDan Finlay2018-07-243-8/+48
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix Banner flash on load
| | * | | | | | | | | run linterbrunobar792018-07-222-2/+2
| | | | | | | | | | |
| | * | | | | | | | | refactor Alert component to work properlybrunobar792018-07-221-6/+46
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #4842 from wjmelements/vimignoreDan Finlay2018-07-241-0/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | Ignore VIM files
| | * | | | | | | | ignore vim filesWilliam Morriss2018-07-211-0/+4
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #4852 from keyiiiii/fix-token-amountDan J Miller2018-07-231-3/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Fix token amount
| | * | | | | | | fix type板橋 清信2018-07-231-1/+1
| | | | | | | | |
| | * | | | | | | fix token amount板橋 清信2018-07-231-3/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #4847 from MetaMask/node-version-checkBruno Barbieri2018-07-225-49/+39
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Enforce usage of node 8.11.3 and npm 6.1.0
| | * | | | | | test npm i --no-savebrunobar792018-07-221-2/+1
| | | | | | | |
| | * | | | | | test npm cibrunobar792018-07-221-12/+2
| | | | | | | |
| | * | | | | | update package-lock.jsonbrunobar792018-07-221-17/+7
| | | | | | | |
| | * | | | | | bump cache versionbrunobar792018-07-221-26/+26
| | | | | | | |
| | * | | | | | update package-lock.jsonbrunobar792018-07-221-7/+17
| | | | | | | |
| | * | | | | | added node version requirementsbrunobar792018-07-225-47/+48
| |/ / / / / /
| * | | | | | Merge pull request #4844 from MetaMask/detectTokenFeatureDan Finlay2018-07-213-12/+40
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Detect token feature
| | * | | | | fix mergeEsteban MIno2018-07-211-1/+0
| | | | | | |
| | * | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-21347-3739/+9536
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4840 from scsaba/transaction-notificationsDan Finlay2018-07-214-1/+64
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Transaction notifications
| | * \ \ \ \ \ Merge branch 'develop' into transaction-notificationsCsaba S2018-07-2139-303/+2514
| | |\ \ \ \ \ \
| | * | | | | | | adding changelog entryCsaba Solya2018-07-211-0/+1
| | | | | | | | |
| | * | | | | | | remove dropped handlerCsaba Solya2018-07-212-11/+1
| | | | | | | | |
| | * | | | | | | add notificationsCsaba Solya2018-07-204-30/+71
| | | | | | | | |
| | * | | | | | | initial testCsaba Solya2018-07-203-1/+32
| | | | | | | | |
| * | | | | | | | Merge pull request #4841 from MetaMask/i4836-new-contractAlexander Tseung2018-07-213-10/+24
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Add fallback options for displaying recipient name in the Confirm screen
| | * | | | | | | Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-213-10/+24
| |/ / / / / / /
| * | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-214-1/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog
| * | | | | | | Merge pull request #4838 from MetaMask/fix-linkDan Finlay2018-07-201-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix link to TREZOR emulator docs in README
| | * | | | | | | Fix link to TREZOR emulator docs in READMEWhymarrh Whitby2018-07-201-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-2037-301/+2258
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Initial trezor support
| | * | | | | | last css fixesbrunobar792018-07-194-10/+45
| | | | | | | |
| | * | | | | | added new global alertbrunobar792018-07-196-8/+126
| | | | | | | |
| | * | | | | | fix support linkbrunobar792018-07-191-1/+1
| | | | | | | |
| | * | | | | | fix unsupported browser viewbrunobar792018-07-192-2/+6
| | | | | | | |
| | * | | | | | lintbrunobar792018-07-191-1/+1
| | | | | | | |
| | * | | | | | scroll smoothbrunobar792018-07-192-3/+12
| | | | | | | |
| | * | | | | | design donebrunobar792018-07-197-48/+385
| | | | | | | |
| | * | | | | | fix browser not supported screenbrunobar792018-07-183-3/+3
| | | | | | | |
| | * | | | | | added some e2e testsbrunobar792018-07-182-1/+48
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-185-33/+47
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | * | | | | | | updated account list based on new designsbrunobar792018-07-185-25/+91
| | | | | | | | |
| | * | | | | | | added tests for removeAccountbrunobar792018-07-172-2/+33
| | | | | | | | |
| | * | | | | | | added more unit testsbrunobar792018-07-172-6/+58
| | | | | | | | |
| | * | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-172-3/+87
| | | | | | | | |
| | * | | | | | | added test for preferences controllerbrunobar792018-07-172-1/+26
| | | | | | | | |
| | * | | | | | | use latest keyring packagesbrunobar792018-07-172-32/+97
| | | | | | | | |
| | * | | | | | | restore circleci configbrunobar792018-07-171-1/+6
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-17134-121/+256
| | |\ \ \ \ \ \ \
| | * | | | | | | | clear circleci cachebrunobar792018-07-141-5/+0
| | | | | | | | | |
generated by cgit (git 2.34.1) at 2024-10-18 08:36:20 +0800