aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixesbrunobar792018-08-104-6779/+49
* add app/vendor dir to eslintignorebrunobar792018-08-101-0/+1
* use new connect.js filebrunobar792018-08-102-9479/+1245
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-1018-29/+194
|\
| * 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 package-lock.jsonbrunobar792018-08-091-1/+1
|\| |
| * | 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
| |/ /
| | * 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
* | | | fix merge conflictsbrunobar792018-08-0921-32534/+32471
* | | | clean upbrunobar792018-08-053-3/+3
* | | | trezor v5 working on firefoxbrunobar792018-08-057-2/+15084
|/ / /
* | | 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
* | | | 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
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | ignore vim filesWilliam Morriss2018-07-211-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4852 from keyiiiii/fix-token-amountDan J Miller2018-07-231-3/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * \ \ \ \ \ 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 screenAlexander Tseung2018-07-213-10/+24
|/ / / / / / /
* | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-214-1/+255
* | | | | | | Merge pull request #4838 from MetaMask/fix-linkDan Finlay2018-07-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 initial...brunobar792018-07-185-33/+47
| |\ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-148-67/+49
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added TREZOR simulator instructionsbrunobar792018-07-142-0/+26
| * | | | | | | | | restore circleci configbrunobar792018-07-141-19/+19
| * | | | | | | | | remove trezor scriptbrunobar792018-07-141-10/+0
| * | | | | | | | | add changelogbrunobar792018-07-141-1/+3
| * | | | | | | | | cache circlecibrunobar792018-07-141-1/+1
| * | | | | | | | | update labelbrunobar792018-07-141-1/+1
| * | | | | | | | | fix account selectionbrunobar792018-07-142-3/+11
| * | | | | | | | | added affiliate link to trezorbrunobar792018-07-143-0/+25
| * | | | | | | | | detect ability to open popup instead of browserbrunobar792018-07-132-6/+13
| * | | | | | | | | test cibrunobar792018-07-131-19/+19
| * | | | | | | | | avoid fallback cachebrunobar792018-07-131-1/+1
| * | | | | | | | | update package-lock.jsonbrunobar792018-07-131-45/+25
| * | | | | | | | | fix account balance bugbrunobar792018-07-132-10/+16
| * | | | | | | | | remove account modal updatedbrunobar792018-07-133-17/+57
| * | | | | | | | | catching up with developbrunobar792018-07-135-27/+80
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-13134-814/+5293
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | added tooltipbrunobar792018-07-124-6/+17
| * | | | | | | | | | forget device and autiload account features addedbrunobar792018-07-126-2/+134
| * | | | | | | | | | update to temp dependenciesbrunobar792018-07-123-16/+18
| * | | | | | | | | | clean upbrunobar792018-07-113-6/+6
| * | | | | | | | | | account removal is workingbrunobar792018-07-116-15/+79
| * | | | | | | | | | finish warning modal UIbrunobar792018-07-119-3/+120
| * | | | | | | | | | added ui to remove accountsbrunobar792018-07-103-4/+50
| * | | | | | | | | | fix trezor labelbrunobar792018-07-101-1/+1
| * | | | | | | | | | added label for trezor accountsbrunobar792018-07-101-1/+3
| * | | | | | | | | | fix account duplicationbrunobar792018-07-102-7/+3
| * | | | | | | | | | fix all the account related bugsbrunobar792018-07-103-17/+42
| * | | | | | | | | | copy updatedbrunobar792018-07-073-3/+6
| * | | | | | | | | | update package-lock.jsonbrunobar792018-07-072-242/+50
| * | | | | | | | | | update connect harwdware screenbrunobar792018-07-073-9/+34
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-0760-275/+1091
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | UI refactorbrunobar792018-07-064-99/+110
| * | | | | | | | | | | Refactor UIbrunobar792018-07-064-266/+328
| * | | | | | | | | | | move strings to localization filebrunobar792018-07-062-11/+21
| * | | | | | | | | | | added message for non-chrome browsersbrunobar792018-07-062-1/+39
| * | | | | | | | | | | package.json updated and tests passingbrunobar792018-07-042-0/+58
| * | | | | | | | | | | tests are passingbrunobar792018-07-042-39263/+30830
| * | | | | | | | | | | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | package-lock updatebrunobar792018-07-041-27/+10
| * | | | | | | | | | | | lint fixbrunobar792018-07-042-3/+3
| * | | | | | | | | | | | fix merge conflictsbrunobar792018-07-049-864/+13539
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-07-04125-739/+710
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update package-lock.jsonbrunobar792018-07-034-9747/+6185
| * | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-035-3655/+2782
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | move hardcoded strings to localization filebrunobar792018-07-032-17/+22
| * | | | | | | | | | | | | | | always open connect hardware in full screen modebrunobar792018-07-031-1/+9
| * | | | | | | | | | | | | | | allow to open specific route in fullscreen modebrunobar792018-07-031-2/+5
| * | | | | | | | | | | | | | | fix environment detection regexbrunobar792018-07-031-1/+1
| * | | | | | | | | | | | | | | use latest eth-keyring-controllerbrunobar792018-07-022-3/+4
| * | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0295-7184/+8625
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | use latest eth-trezor-keyringbrunobar792018-06-262-2/+2
| * | | | | | | | | | | | | | | | fixesbrunobar792018-06-233-6552/+6543
| * | | | | | | | | | | | | | | | point to new version of eth-trezor-keyringbrunobar792018-06-231-1/+1
| * | | | | | | | | | | | | | | | clean upBruno2018-06-131-16/+19
| * | | | | | | | | | | | | | | | fix merge conflictsBruno2018-06-1312-125/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:51:20 +0800