aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Version 4.13.0v4.13.0Dan Finlay2018-09-282-2/+6
* Merge pull request #5349 from MetaMask/v4.11.1Kevin Serrano2018-09-262-6505/+6523
|\
| * remove comment about etherdeltabobby dresser2018-09-261-1/+0
| * Version 4.11.1Dan Finlay2018-09-262-6505/+6524
|/
* Merge pull request #5346 from MetaMask/v4.11.1Dan Finlay2018-09-2619-6626/+6956
|\
| * update package-lock.jsonbrunobar792018-09-261-6450/+6442
| * Merge branch 'master' into v4.11.1Bruno Barbieri2018-09-252-1/+5
| |\ | |/ |/|
* | Merge pull request #5313 from MetaMask/Version-4.11.0v4.11.0Thomas Huang2018-09-252-2/+6
|\ \
| * | Version 4.11.0Dan Finlay2018-09-222-2/+6
* | | Merge pull request #5079 from MetaMask/v4.9.3kumavis2018-08-1753-76/+774
|\| |
| | * bump to v4.11.1brunobar792018-09-251-1/+1
| | * Merge pull request #5084 from MetaMask/ledger-support-without-providerDan Finlay2018-08-2118-194/+532
| |/|
| | * fix ledger affiliate linkbrunobar792018-08-171-1/+1
| | * fix e2e testsbrunobar792018-08-171-1/+4
| | * ui readybrunobar792018-08-174-11/+42
| | * connect screen readybrunobar792018-08-175-32/+131
| | * change Metamask for MetaMaskbrunobar792018-08-151-7/+1
| | * update package-lock.jsonbrunobar792018-08-151-2/+3
| | * Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ...brunobar792018-08-1520-33/+66
| | |\
| | | * Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-1520-33/+66
| | | |\
| | * | | use eth-ledger-bridge-keyring from npmbrunobar792018-08-151-1/+1
| | |/ /
| | * | remove console logsbrunobar792018-08-152-8/+2
| | * | fixed unit testsbrunobar792018-08-152-5/+15
| | * | more uibrunobar792018-08-151-1/+2
| | * | fixbrunobar792018-08-151-1/+1
| | * | ui fixesbrunobar792018-08-155-34/+46
| | * | fix tx testsbrunobar792018-08-144-14/+25
| | * | legacy and new hd path workingbrunobar792018-08-145-25/+53
| | * | good progress adding pathsbrunobar792018-08-148-67/+140
| | * | remove ledger libbrunobar792018-08-121-1/+0
| | * | clean upbrunobar792018-08-124-43/+4
| | * | this should be ready to gobrunobar792018-08-124-323/+60
| | * | clean upbrunobar792018-08-121-45/+36
| | * | message signing worksbrunobar792018-08-123-6/+19
| | * | workingbrunobar792018-08-122-24/+14
| | * | tx signature is validbrunobar792018-08-121-0/+1
| | * | tx signing should workbrunobar792018-08-121-10/+39
| | * | rename keyringbrunobar792018-08-112-1/+2
| | * | able to add accountsbrunobar792018-08-114-40/+107
| | * | iframe communication workingbrunobar792018-08-118-67/+209
| | * | refactor to support multiple hw walletsbrunobar792018-08-1110-103/+247
| * | | v4.9.3v4.9.3Thomas2018-08-161-1/+1
| * | | Bump ChangelogThomas2018-08-161-0/+6
| * | | Merge pull request #5037 from MetaMask/masterDan Finlay2018-08-162-1/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1Dan Finlay2018-08-1036-32551/+32635
|\ \ \ \
| * \ \ \ Merge branch 'master' into v4.9.2Thomas Huang2018-08-100-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4954 from MetaMask/v4.9.0Dan Finlay2018-08-08487-36876/+44757
|\ \ \ \ \
| * | | | | Bump ChangelogThomas2018-08-071-1/+3
| * | | | | v4.9.0 ReleaseThomas2018-08-071-1/+1
| * | | | | Update ChangelogThomas2018-08-071-5/+10
| | * | | | Bump ChangelogThomas2018-08-101-0/+4
| | * | | | v4.9.2Thomas2018-08-101-1/+1
| | | * | | Merge pull request #5059 from MetaMask/e2e-tests-more-reliableDan J Miller2018-08-155-20/+45
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Remove unnecessary else in test/e2e/beta/contract-test/contract.jsDan Miller2018-08-151-1/+2
| | | | * | Add explicit waits for submitted status for some txs initiated from test dapp.Dan Miller2018-08-151-0/+7
| | | | * | Reload e2e beta test browser if initial screen doesn't load.Dan Miller2018-08-152-2/+16
| | | | * | Increase timeout on wait for contract status update in metamask-beta-ui-specDan Miller2018-08-151-1/+1
| | | | * | Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-bet...Dan Miller2018-08-141-9/+9
| | | | * | Make deployment states in test/e2e/beta/contract-test/contract.js more explicitDan Miller2018-08-142-5/+6
| | | | * | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.jsDan Miller2018-08-141-5/+7
| | | | |/
| | | * | Merge pull request #5060 from MetaMask/bignumber-stringDan Finlay2018-08-153-4/+4
| | | |\ \
| | | | * | Cast arguments for new Bignumbers() to string.Dan Miller2018-08-153-4/+4
| | | | |/
| | | * | Merge pull request #5058 from whymarrh/fix-wordsWhymarrh Whitby2018-08-1414-26/+26
| | | |\ \
| | | | * | Fix casing of Bitcoin, Ethereum, and Litecoin across localized messagesWhymarrh Whitby2018-08-149-11/+11
| | | | * | Fix casing of MetaMask in all localized messagesWhymarrh Whitby2018-08-1411-16/+16
| | | | |/
| | | * | Merge pull request #4961 from whymarrh/download-seed-phraseWhymarrh Whitby2018-08-143-3/+30
| | | |\ \ | | | | |/ | | | |/|
| | | | * 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
| | |/|
| | | * 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 qr-code...brunobar792018-07-3110-11/+100
| | | |\ \ \
| | | * | | | 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
| | |\ \ \ \ \ \
| | | * | | | | | 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 releaseJenny Pollack2018-08-102-4/+4
| | |/ / / / / /
| | * | | | | | Merge pull request #5017 from MetaMask/v4.9.1Dan Finlay2018-08-102-10/+21
| | |\ \ \ \ \ \
| | | * | | | | | 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
| | |/ / / / / /
| | * | | | | | Merge pull request #5010 from eduadiez/developThomas Huang2018-08-101-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | Avoid overwriting a domain that can be resolved by DNSEduardo Antuña Díez2018-08-091-2/+2
| | | * | | | | | Fixed ENS to IPFS functionality in FirefoxEduardo Antuña Díez2018-08-091-1/+1
| | |/ / / / / /
| | * | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failureDan J Miller2018-08-092-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | 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
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | 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 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 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-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
| | |\ \ \ \
| | | * | | | 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.mdKevin Serrano2018-08-081-0/+2
| | |/ / / / /
| | | * | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-0834-1259/+1149
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #4960 from whymarrh/import-account-errorWhymarrh Whitby2018-08-072-2/+10
| | |\ \ \ \ \
| | | * | | | | 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 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
| | | * | | | | 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
| |/| | | | |
| | * | | | | 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 b...Dan Miller2018-08-063-3/+17
| |/ / / / /
| * | | | | Merge pull request #4948 from MetaMask/i4638-update-fontAlexander Tseung2018-08-043-5/+0
| |\ \ \ \ \
| | * | | | | 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 multiple timesAlexander Tseung2018-08-042-6/+21
| |/ / / / /
| * | | | | Merge pull request #4906 from MetaMask/updatePhishingPageKevin Serrano2018-08-031-23/+26
| |\ \ \ \ \
| | * | | | | 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.Dan Miller2018-08-012-8/+8
| |/ / / / / /
| * | | | | | Merge pull request #4888 from whymarrh/suggest-new-uiWhymarrh Whitby2018-08-0112-591/+861
| |\ \ \ \ \ \
| | * | | | | | 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
| | * | | | | | New ui e2e tests switch to localhost provider (needed after new ui selection ...Dan Miller2018-07-282-0/+20
| | * | | | | | 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
| | * | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| |\ \ \ \ \
| | * | | | | Add deprecation message for eth_signTypedDatabitpshr2018-07-282-6/+20
| | | | * | | 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
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #4893 from kelvintyb/developThomas Huang2018-07-284-3/+65
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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 warningbobby dresser2018-07-281-2/+0
| |/ / / /
| * | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditionalkumavis2018-07-271-2/+2
| |\ \ \ \
| | * | | | Update Chinese namingKevin Serrano2018-07-241-2/+2
| * | | | | Merge pull request #4802 from 03-26/developkumavis2018-07-271-4/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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 estimationJenny Pollack2018-07-251-7/+3
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #4875 from MetaMask/bmd/readme-releaseDan Finlay2018-07-261-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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 27frankiebee2018-07-261-0/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamerWilliam Morriss2018-07-251-0/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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
| * | | | | | | | | | Merge pull request #4820 from MetaMask/codeownersWilliam Morriss2018-07-251-0/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added codeowners fileDan Finlay2018-07-181-0/+6
| * | | | | | | | | | | Merge pull request #4845 from MetaMask/button-groupDan J Miller2018-07-256-0/+248
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Adds tests for button group component.Dan Miller2018-07-241-0/+97
| | * | | | | | | | | | Add ButtonGroup componentAlexander Tseung2018-07-245-0/+151
| | | | | | | | | | | * 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
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-252-0/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-uiAlexander Tseung2018-07-257-18/+111
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | * | | | | | | | | 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
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 04:54:33 +0800