aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
* Merge pull request #5792 from MetaMask/signed-type-data-error-hw-walletBruno Barbieri2018-11-271-9/+16
|\
| * Use Array.includesBruno Barbieri2018-11-271-4/+4
| * remove extra semicolonbrunobar792018-11-211-1/+1
| * consider hw walletsbrunobar792018-11-211-9/+16
* | Show disabled cursor in .network-disabled state (#5829)Whymarrh Whitby2018-11-271-1/+1
* | Trim whitespace from seed phrase during import (#5827)Whymarrh Whitby2018-11-271-2/+4
* | Merge pull request #5832 from whymarrh/connect-request-notifsWhymarrh Whitby2018-11-272-4/+8
|\ \
| * | Show Connect Requests count in extension badgeWhymarrh Whitby2018-11-261-1/+3
| * | Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
|/ /
* | Merge pull request #5816 from MetaMask/issue-5815Thomas Huang2018-11-2521-44/+44
|\ \
| * | Increase Token Symbol length to twelveThomas Huang2018-11-2321-44/+44
* | | change wording of phishing notice, due to EIP 1102 (#5819)Christopher Elwell2018-11-241-1/+1
|/ /
* | Merge pull request #5810 from whymarrh/bump-nvmrcWhymarrh Whitby2018-11-222-9/+10
|\ \
| * | Update local build instructionsWhymarrh Whitby2018-11-221-8/+9
| * | nvm: Bump Node version to 8.13Whymarrh Whitby2018-11-221-1/+1
* | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-2212-45/+167
|\ \ \ | |/ / |/| |
| * | bump eth-trezor-keyringbrunobar792018-11-222-7288/+7352
| * | update package-lockbrunobar792018-11-211-7313/+7277
| * | trezor v6brunobar792018-11-213-7419/+7441
| * | fix merge conflictsbrunobar792018-11-2172-8609/+8076
| |\ \
| * | | clean upbrunobar792018-11-152-3/+2
| * | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezo...brunobar792018-11-152-8/+19
| |\ \ \
| | * | | testbrunobar792018-11-151-4/+0
| | * | | testbrunobar792018-11-151-1/+1
| | * | | testbrunobar792018-11-151-1/+1
| | * | | try with custom boxbrunobar792018-11-151-1/+1
| | * | | package-lock.jsonbrunobar792018-11-151-20/+41
| * | | | update package-lock.jsonbrunobar792018-11-151-17/+27
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-157-10/+45
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-1/+40
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1446-479/+4603
| |\ \ \ \ \
| * \ \ \ \ \ fix merge conflictsbrunobar792018-11-07191-3748/+6145
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-21104-8896/+12489
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix conflictsbrunobar792018-10-17298-12054/+28334
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update package-lock.jsonbrunobar792018-09-111-95/+167
| * | | | | | | | | fix merge conflictsbrunobar792018-09-114-4/+8
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | update package-lock.jsonbrunobar792018-09-111-49/+126
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-06173-2562/+4615
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add port names blacklistbrunobar792018-08-231-0/+8
| * | | | | | | | | | | handle onDisconnectbrunobar792018-08-231-0/+4
| * | | | | | | | | | | fix merge conflictsbrunobar792018-08-2311-5776/+1605
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update package-lockbrunobar792018-08-221-6/+14
| * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-224-18/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix commentbrunobar792018-08-211-2/+0
| * | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-21116-4856/+8379
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update package-lockbrunobar792018-08-211-1/+1
| * | | | | | | | | | | | | | fix e2e testsbrunobar792018-08-111-30/+1
| * | | | | | | | | | | | | | undo permission changebrunobar792018-08-111-1/+0
| * | | | | | | | | | | | | | add error messagesbrunobar792018-08-111-2/+4
| * | | | | | | | | | | | | | hide export private key for trezor accountsbrunobar792018-08-102-32/+46
| * | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ update package-lock.jsonbrunobar792018-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-0921-32534/+32471
| * | | | | | | | | | | | | | | | clean upbrunobar792018-08-053-3/+3
| * | | | | | | | | | | | | | | | trezor v5 working on firefoxbrunobar792018-08-057-2/+15084
* | | | | | | | | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799)Whymarrh Whitby2018-11-221-16/+29
* | | | | | | | | | | | | | | | | Show byte count for hex data on confirm screen (#5798)Whymarrh Whitby2018-11-221-1/+2
* | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switchWhymarrh Whitby2018-11-2241-795/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remove first-time and navigate-txs integration testsWhymarrh Whitby2018-11-215-340/+1
| * | | | | | | | | | | | | | | | | Speed up genStates script by using built-in require fnWhymarrh Whitby2018-11-211-4/+3
| * | | | | | | | | | | | | | | | | ci: Drop old UI e2e tests from CircleCIWhymarrh Whitby2018-11-211-41/+0
| * | | | | | | | | | | | | | | | | Remove Mascara from CircleCI configWhymarrh Whitby2018-11-211-13/+0
| * | | | | | | | | | | | | | | | | Remove "Beta" from welcome messagesWhymarrh Whitby2018-11-2121-34/+34
| * | | | | | | | | | | | | | | | | Don't announce new UI to users switching backWhymarrh Whitby2018-11-211-0/+1
| * | | | | | | | | | | | | | | | | Update new UI links in the old UI s/Beta/New/Whymarrh Whitby2018-11-211-1/+1
| * | | | | | | | | | | | | | | | | Remove "Beta" from header logoWhymarrh Whitby2018-11-213-116/+63
| * | | | | | | | | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fnWhymarrh Whitby2018-11-211-5/+16
| * | | | | | | | | | | | | | | | | Update new UI e2e tests for new UI defaultWhymarrh Whitby2018-11-214-209/+21
| * | | | | | | | | | | | | | | | | Default to the new UI for first time usersWhymarrh Whitby2018-11-214-32/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5791 from MetaMask/fix-ledger-stuffBruno Barbieri2018-11-212-208/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update package-lock.jsonbrunobar792018-11-212-208/+208
|/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Version 5.0.3 (#5785)Dan Finlay2018-11-216-277/+270
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fix button styling for Create Account Connect (#5787)Alexander Tseung2018-11-203-47/+13
* | | | | | | | | | | | | | | Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-2037-104/+138
* | | | | | | | | | | | | | | 1102: Push publicConfigStore to next turn to avoid race conditiono (#5777)Paul Bouchon2018-11-181-2/+6
* | | | | | | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765)Dan Finlay2018-11-174-0/+107
* | | | | | | | | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-1715-37/+37
* | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-179-229/+265
* | | | | | | | | | | | | | | delete generated fileEsteban MIno2018-11-161-1171/+0
* | | | | | | | | | | | | | | detect osEsteban MIno2018-11-162-1/+1176
* | | | | | | | | | | | | | | fix url and remove -e fr macosEsteban MIno2018-11-161-3/+2
* | | | | | | | | | | | | | | working on macosEsteban MIno2018-11-161-3/+2
* | | | | | | | | | | | | | | fix macos attemptEsteban MIno2018-11-161-1/+3
* | | | | | | | | | | | | | | sed a command macosEsteban MIno2018-11-161-2/+2
* | | | | | | | | | | | | | | add -i suffix -e for macosEsteban MIno2018-11-161-4/+4
* | | | | | | | | | | | | | | add -i workaround suffix for macosEsteban MIno2018-11-161-1/+1
* | | | | | | | | | | | | | | fix typosEsteban MIno2018-11-161-2/+2
* | | | | | | | | | | | | | | add commentsEsteban MIno2018-11-161-7/+15
* | | | | | | | | | | | | | | delete use of grepEsteban MIno2018-11-161-1/+1
* | | | | | | | | | | | | | | provide automatic changelog since last tag for linuxEsteban MIno2018-11-163-1/+18
* | | | | | | | | | | | | | | Update npm dependencies to reduce vulnerabilities (#5556)Bruno Barbieri2018-11-162-8970/+12368
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5759 from MetaMask/drizzle-updateBruno Barbieri2018-11-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove error flags from drizzle setupbrunobar792018-11-151-4/+0
* | | | | | | | | | | | | | | Merge pull request #5760 from MetaMask/retroactive-changelogkumavis2018-11-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add old changelog entryDan Finlay2018-11-151-0/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | / Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-156-6/+44
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | 1102: use meta title if it exists before titlePaul Bouchon2018-11-151-0/+5
* | | | | | | | | | | | | Show APPROVED status for transactions that have been approved but not submittedAlexander Tseung2018-11-142-1/+35
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Update Balanc3 API (#5744)Paul Bouchon2018-11-143-32/+16
* | | | | | | | | | | | Update support links to zendesk (#5745)Bruno Barbieri2018-11-142-2/+2
* | | | | | | | | | | | Repair link to reset instructions (#5733)Micah Alcorn2018-11-141-1/+1
* | | | | | | | | | | | encourage stackexchange in issue templates (#5737)bobby dresser2018-11-141-4/+5
* | | | | | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-1419-19/+795
* | | | | | | | | | | | Slovenian and slovak fixes (#5730)Filip Š2018-11-133-330/+1703
* | | | | | | | | | | | Version 5.0.2v5Dan Finlay2018-11-102-1/+6
* | | | | | | | | | | | EIP-1102: Update publicConfig store concurrently with approvalPaul Bouchon2018-11-103-33/+29
* | | | | | | | | | | | Merge pull request #5674 from MetaMask/responsive-e2e-testsThomas Huang2018-11-104-18/+376
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.specDan Miller2018-11-084-18/+376
* | | | | | | | | | | | | Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5...Alexander Tseung2018-11-102-4/+4
* | | | | | | | | | | | | 1102: Fix inpage listener syntax (#5708) (#5709)Noah I2018-11-091-2/+2
* | | | | | | | | | | | | Version 5.0.1 (#5694)Dan Finlay2018-11-082-1/+5
* | | | | | | | | | | | | Merge pull request #5547 from MetaMask/front-ends-deps-gulp-bundleDan J Miller2018-11-084-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bundle some ui dependencies separately to limit the build size of ui.jsDan Miller2018-11-014-1/+48
* | | | | | | | | | | | | | Cleanupbitpshr2018-11-081-18/+10
* | | | | | | | | | | | | | 1102: use postMessage instead of injected scripts to bypass CSPbitpshr2018-11-081-17/+13
* | | | | | | | | | | | | | wipbitpshr2018-11-082-24/+39
* | | | | | | | | | | | | | Merge pull request #5481 from MetaMask/reducersThomas Huang2018-11-073-3/+1580
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | nextUnreadNotice undefined rather than nullThomas2018-11-011-1/+1
| * | | | | | | | | | | | | Remove .onlyThomas2018-10-311-1/+1
| * | | | | | | | | | | | | Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispat...Thomas2018-10-312-23/+96
| * | | | | | | | | | | | | Merge branch 'develop' into reducersThomas2018-10-31221-4475/+11298
| |\| | | | | | | | | | | |
| * | | | | | | | | | | | | Isolate variables to individual testsThomas2018-10-311-53/+64
| * | | | | | | | | | | | | ReducersThomas2018-10-102-0/+1491
| * | | | | | | | | | | | | Set maxMode and toNickname defaults for clear_sendThomas2018-10-101-3/+5
* | | | | | | | | | | | | | Merge pull request #5691 from MetaMask/fix-typoBruno Barbieri2018-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix typobrunobar792018-11-071-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5689 from MetaMask/reject-cached-approvalBruno Barbieri2018-11-074-13/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update drizzle testsbrunobar792018-11-071-5/+20
| * | | | | | | | | | | | | | Revert package-lock.jsonbitpshr2018-11-071-6780/+6762
| * | | | | | | | | | | | | | Fix lint errorsbitpshr2018-11-072-6763/+6781
| * | | | | | | | | | | | | | Remove injected script tags after usebitpshr2018-11-071-0/+2
| * | | | | | | | | | | | | | Clear cached approval after rejectionbitpshr2018-11-072-8/+11
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Version 5.0.0 (#5685)Dan Finlay2018-11-072-1/+5
* | | | | | | | | | | | | | Update the colour of the default image used on Connect Request (#5678)Whymarrh Whitby2018-11-061-1/+2
* | | | | | | | | | | | | | Update "Learn more" link on 1102 connect screen (#5677)Whymarrh Whitby2018-11-061-1/+7
* | | | | | | | | | | | | | Move experimental provider augmentationbitpshr2018-11-061-13/+13
* | | | | | | | | | | | | | Add experimental RPC method supportbitpshr2018-11-063-6/+20
* | | | | | | | | | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-0619-51/+388
* | | | | | | | | | | | | | Do not modify isApproved when lockedbitpshr2018-11-061-2/+1
* | | | | | | | | | | | | | Mark origins as unapproved if user explicitly locks MetaMaskbitpshr2018-11-062-3/+5
* | | | | | | | | | | | | | Enable cachingPaul Bouchon2018-11-061-1/+1
* | | | | | | | | | | | | | isApproved should return falsebitpshr2018-11-061-1/+1
* | | | | | | | | | | | | | Disable mascara testsbitpshr2018-11-061-13/+13
* | | | | | | | | | | | | | Increase timeout in Mascara testbitpshr2018-11-061-1/+1
* | | | | | | | | | | | | | Remove internal listenersbitpshr2018-11-061-6/+15
* | | | | | | | | | | | | | rebasebitpshr2018-11-061-3/+3
* | | | | | | | | | | | | | Disable approval cachingbitpshr2018-11-064-6/+34
* | | | | | | | | | | | | | Differentiate locked and enabledbitpshr2018-11-064-27/+10
* | | | | | | | | | | | | | Code bathbitpshr2018-11-064-33/+49
* | | | | | | | | | | | | | Handle logout gracefullybitpshr2018-11-064-25/+42
* | | | | | | | | | | | | | Fix lint issuesbitpshr2018-11-061-1/+1
* | | | | | | | | | | | | | Only filter selectedAddress from publicConfig storebitpshr2018-11-061-6/+10
* | | | | | | | | | | | | | Fix race condition with publicConfigStorebitpshr2018-11-061-5/+24
* | | | | | | | | | | | | | Move convenience methods to _metamask namespacebitpshr2018-11-061-28/+55
* | | | | | | | | | | | | | Fix lint issuesbitpshr2018-11-061-1/+3
* | | | | | | | | | | | | | Add isUnlocked provider hookbitpshr2018-11-064-3/+29
* | | | | | | | | | | | | | Differentiate isEnabled and isApproved hookbitpshr2018-11-061-3/+12
* | | | | | | | | | | | | | Update isEnabled checkbitpshr2018-11-061-1/+3
* | | | | | | | | | | | | | Fix beta e2e testsbitpshr2018-11-061-1/+1
* | | | | | | | | | | | | | Remove duplicate i18n keysbitpshr2018-11-062-9/+0
* | | | | | | | | | | | | | Cleanup after rebasebitpshr2018-11-061-1/+1
* | | | | | | | | | | | | | EIP-1102: add user privacy optionbitpshr2018-11-0634-200/+256
* | | | | | | | | | | | | | EIP-1102: add isEnabled convenience method to providerbitpshr2018-11-063-9/+53
* | | | | | | | | | | | | | EIP-1102: Add option to force-enable providerbitpshr2018-11-0632-784/+672
* | | | | | | | | | | | | | EIP-1102: updated implementationbitpshr2018-11-0651-7656/+8279
* | | | | | | | | | | | | | Version 4.17.1Dan Finlay2018-11-062-1/+5
* | | | | | | | | | | | | | network - infura - hardcode net_version and eth_chainId (#5670)kumavis2018-11-061-0/+33
* | | | | | | | | | | | | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-062-2/+28
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5671 from MetaMask/i18n-tool-fixkumavis2018-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | development tools - fix i18n verify toolkumavis2018-11-051-1/+1
* | | | | | | | | | | | | | Merge pull request #5651 from MetaMask/kumavis-patch-3kumavis2018-11-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | CI - job-publish-release - fix github commandkumavis2018-11-021-2/+2
* | | | | | | | | | | | | | | Merge pull request #5659 from MetaMask/token-rates-bugfixkumavis2018-11-041-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | token-rates - protect against bad token datakumavis2018-11-031-4/+7
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Revert "support eth_chainId"Thomas Huang2018-11-041-14/+4
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5650 from MetaMask/masterkumavis2018-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5649 from MetaMask/developkumavis2018-11-02143-2196/+3782
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5648 from MetaMask/v4.17.0kumavis2018-11-022-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | / / / / / / / / / / / | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 4.17.0v4.17.0kumavis2018-11-022-2/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | fixed currency-display (#5619)HackyMiner2018-10-302-3/+22
* | | | | | | | | | | | | Merge pull request #5560 from MetaMask/sentry-enhancements2kumavis2018-10-3010-80/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension...kumavis2018-10-301-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into sentry-enhancements2kumavis2018-10-30128-2035/+3082
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-30129-2108/+3130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-218-58/+436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sentry - include app state in ui errorskumavis2018-10-205-16/+38
| * | | | | | | | | | | | | | | | sentry - replace raven-js with sentry/browserkumavis2018-10-206-55/+92
| * | | | | | | | | | | | | | | | blacklist + currency - report error via log instead of throwkumavis2018-10-192-5/+12
| * | | | | | | | | | | | | | | | lint fixkumavis2018-10-192-3/+1
| * | | | | | | | | | | | | | | | fetch debugger - only append source stack if no stack is presentkumavis2018-10-191-4/+6
| * | | | | | | | | | | | | | | | sentry - failed txs - namespace txMeta for better readabilitykumavis2018-10-191-1/+1
| * | | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for bugfixkumavis2018-10-192-11/+39
| * | | | | | | | | | | | | | | | currency - throw errors on failurekumavis2018-10-191-3/+17
| * | | | | | | | | | | | | | | | blacklist - throw errors on request/parse failurekumavis2018-10-191-4/+19
| * | | | | | | | | | | | | | | | sentry - update raven-jskumavis2018-10-192-5/+5
| * | | | | | | | | | | | | | | | sentry - move isBrave decoration to insides of try-catchkumavis2018-10-191-1/+2
* | | | | | | | | | | | | | | | | Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-308-16/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB...kumavis2018-10-2666-1692/+1809
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | old-ui - pending tx - allow undefined values for gas + gasPricekumavis2018-10-261-2/+8
| * | | | | | | | | | | | | | | | | tx-gas-util - set error message when invalidating tx based on tx data but no ...kumavis2018-10-211-4/+5
| * | | | | | | | | | | | | | | | | send tx - validate - simplify error message for attempting to call function o...kumavis2018-10-211-1/+1
| * | | | | | | | | | | | | | | | | ui - use variable to clarify result of emptiness checkkumavis2018-10-213-4/+10
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into developkumavis2018-10-21160-2452/+8611
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | tx-gas-utils - improve format + commentskumavis2018-10-101-12/+18
| * | | | | | | | | | | | | | | | | ganache-core merged my PR, so I changed some comments to clarify that ganache...Howard Braham2018-10-104-8/+9
| * | | | | | | | | | | | | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-108-11/+25
* | | | | | | | | | | | | | | | | | Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-304-51/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for signTypedData version bumpkumavis2018-10-302-37/+49
| * | | | | | | | | | | | | | | | | Add version to unapprovedMessageThomas2018-10-251-2/+2
| * | | | | | | | | | | | | | | | | Remove commented out/unused methodsThomas2018-10-251-27/+2
| * | | | | | | | | | | | | | | | | Validate signTypedData in eth-json-rpc-middlewareThomas2018-10-252-28/+32
* | | | | | | | | | | | | | | | | | Merge pull request #5552 from EthersocialNetwork/eth_chainidkumavis2018-10-301-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into eth_chainidhackyminer2018-10-26128-1951/+2808
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update network.jskumavis2018-10-211-0/+1
| * | | | | | | | | | | | | | | | | | | network - improve logging and type conversionkumavis2018-10-211-4/+6
| * | | | | | | | | | | | | | | | | | | support both eth_chainId and net_versionhackyminer2018-10-201-4/+11
* | | | | | | | | | | | | | | | | | | | Merge pull request #5625 from filips123/developkumavis2018-10-301-105/+658
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix Slovenian translationFilip Š2018-10-271-1/+1
| * | | | | | | | | | | | | | | | | | | | Add Slovenian translation for EIP-1102Filip Š2018-10-271-0/+39
| * | | | | | | | | | | | | | | | | | | | Fix Slovenian translationFilip Š2018-10-271-105/+619
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #5632 from MetaMask/typo-fixkumavis2018-10-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | preferences - fix typokumavis2018-10-301-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-2669-217/+586
* | | | | | | | | | | | | | | | | | | Fix raised button min-height (#5613)Alexander Tseung2018-10-261-0/+1
* | | | | | | | | | | | | | | | | | | deps - bump eth-block-tracker for fix (#5614)kumavis2018-10-262-20/+13
| |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Fix button styling for overflowing text (#5602)Alexander Tseung2018-10-251-2/+2
* | | | | | | | | | | | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon componen...Alexander Tseung2018-10-2521-147/+230
* | | | | | | | | | | | | | | | | | Fix UnknownFunction showing as Confirm (#5590)Alexander Tseung2018-10-241-0/+11
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Add Activity Log entry for onchain failures for a transaction. Change scrolli...Alexander Tseung2018-10-2315-112/+23
* | | | | | | | | | | | | | | | | deploy - docs - publish via npm script (#5580)kumavis2018-10-231-1/+1
* | | | | | | | | | | | | | | | | Update CHANGELOG.md (#5566)kumavis2018-10-231-0/+1
* | | | | | | | | | | | | | | | | Merge pull request #5576 from marijnbent/patch-1kumavis2018-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Updated translation for main network nameMarijn Bent2018-10-231-1/+1
* | | | | | | | | | | | | | | | | | Fix signature request styling issues (#5574)Alexander Tseung2018-10-231-1/+1
* | | | | | | | | | | | | | | | | | i18n - update haitian translations (#5565)kumavis2018-10-232-1235/+1312
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #5570 from alextsg/i5558-account-display-widthkumavis2018-10-2113-44/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix account display width for large currency valuesAlexander Tseung2018-10-2113-44/+68
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5569 from MetaMask/fix-drizzlekumavis2018-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | install truffle globallybrunobar792018-10-211-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | ens-ipfs - refactor for readability (#5568)kumavis2018-10-218-125/+131
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add support for wallet_watchAssetEsteban MIno2018-10-202-1/+6
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | i18n - use localized names in language selectionBrandon Wissmann2018-10-212-22/+22
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5543 from MetaMask/shapeshift-list-itemThomas Huang2018-10-201-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update Shapeshift logo url and adjust list item contentsThomas2018-10-181-3/+2
* | | | | | | | | | | | | | | | Merge pull request #5561 from MetaMask/deps-fix-gulpThomas Huang2018-10-202-25/+384
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \