aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | deps - fix gulp ref to gulp#v4.0.0kumavis2018-10-202-25/+384
|/ / / / / / / / / / / / / / / / /
* | / / / / / / / / / / / / / / / specific add and remove methods for frequentRpcList (#5554)Esteban MiƱo2018-10-203-28/+46
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Set `NODE_ENV` when generating bundler (#4983)William Chong2018-10-191-1/+3
* | | | | | | | | | | | | | | | Merge pull request #5540 from MetaMask/masterkumavis2018-10-182-5/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #5539 from MetaMask/v4.16.0kumavis2018-10-18115-995/+4688
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update CHANGELOG.mdv4.16.0Kevin Serrano2018-10-181-1/+1
| | * | | | | | | | | | | | | | Changelog - fix release dateskumavis2018-10-181-2/+2
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | 4.16.0kumavis2018-10-182-5/+22
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5537 from MetaMask/inpage-provider-maxlistenerskumavis2018-10-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | inpage - increase provider max listeners to avoid warningskumavis2018-10-181-0/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | i18n - add polish (pl)Bartek2018-10-182-0/+1214
* | | | | | | | | | | | | | Merge pull request #5127 from MetaMask/account-tracker-network-changekumavis2018-10-181-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into account-tracker-network-changekumavis2018-09-28337-4902/+14253
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | metamask controller - force account tracker to update balances on network changekumavis2018-08-231-0/+4
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5536 from whymarrh/add-token-helpWhymarrh Whitby2018-10-189-165/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-188-25/+90
| * | | | | | | | | | | | | | | Delete add-token integration testWhymarrh Whitby2018-10-181-140/+0
* | | | | | | | | | | | | | | | Merge pull request #5522 from MetaMask/fetch-debuggingWhymarrh Whitby2018-10-182-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | enable fetch debuggingkumavis2018-10-152-0/+37
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-1785-653/+2466
* | | | | | | | | | | | | | | Merge pull request #5534 from whymarrh/i18n-warningsWhymarrh Whitby2018-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Lower i18n-helper#getMessage log level from error to warningWhymarrh Whitby2018-10-171-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5535 from whymarrh/export-privkey-wordsWhymarrh Whitby2018-10-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix wording of private key warning shown during exportWhymarrh Whitby2018-10-171-1/+1
| * | | | | | | | | | | | | | Update wording on export privkey modalWhymarrh Whitby2018-10-171-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5530 from whymarrh/fix-web3-inject-checksWhymarrh Whitby2018-10-171-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix document extension check when injecting web3Whymarrh Whitby2018-10-161-7/+12
* | | | | | | | | | | | | | | Merge pull request #5529 from whymarrh/max-btn-click-areaWhymarrh Whitby2018-10-162-19/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Decrease click area for AmountMaxButton on send screenWhymarrh Whitby2018-10-162-19/+24
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5528 from MetaMask/remove-greenkeeper-badgeThomas Huang2018-10-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove greenkeeper badge from READMEThomas2018-10-161-1/+1
* | | | | | | | | | | | | | | add tooltip for view etherscan tx (#5518)Michael J. Cohen2018-10-161-7/+10
* | | | | | | | | | | | | | | Merge pull request #5521 from MetaMask/deps-old-ethjs-fixkumavis2018-10-162-92/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | deps - bump eth-token-tracker for ethjs-rpc bug in depskumavis2018-10-152-92/+70
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Improve Korean translations (#5515)Noel Yoo2018-10-161-7/+85
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed wrong Spanish translation of `key` (#5517)Pedro GutiƩrrez2018-10-161-7/+7
* | | | | | | | | | | | | | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-169-6/+126
* | | | | | | | | | | | | | Update Italian translations (#5502)matteopey2018-10-162-5/+481
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for pending blockRef bugfixkumavis2018-10-122-17/+31
| | | * | | | | | | | | | Merge pull request #5512 from MetaMask/v4.14.0Kevin Serrano2018-10-15429-9291/+21575
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5511 from MetaMask/merge-masterkumavis2018-10-122-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into developkumavis2018-10-122-1/+4
|/| | | | | | | | | | | | | | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5384 from MetaMask/Version-4.13.0Dan Finlay2018-10-052-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Version 4.13.0v4.13.0Dan Finlay2018-09-282-2/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Correct 4.14.0 versionDan Finlay2018-10-122-2/+2
* | | | | | | | | | | | | Merge pull request #5503 from whymarrh/fix-zendesk-linksWhymarrh Whitby2018-10-124-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update Zendesk links for new subdomainWhymarrh Whitby2018-10-124-4/+4
* | | | | | | | | | | | | | Merge pull request #5505 from MetaMask/Version-4.14.0Thomas Huang2018-10-122-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Version 4.14.0v4.14.0Dan Finlay2018-10-122-1/+4
* | | | | | | | | | | | | | | Fix en, ko locales (#5483)Noel Yoo2018-10-112-49/+49
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5494 from whymarrh/fix-seed-phrase-screenThomas Huang2018-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix styling of first-time-flow containerWhymarrh Whitby2018-10-111-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5491 from whymarrh/assert-new-tx-using-selected-addressWhymarrh Whitby2018-10-112-4/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-112-4/+30
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5490 from whymarrh/revert-5375Whymarrh Whitby2018-10-111-23/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5...Whymarrh Whitby2018-10-111-23/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-105-141/+1643
* | | | | | | | | | | | | | Merge pull request #5480 from noelyoo/typokumavis2018-10-102-236/+236
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Alphabetize ko locale json keysnoelyoo2018-10-101-224/+224
| * | | | | | | | | | | | | | Alphabetize en locale json keysnoelyoo2018-10-101-12/+12
* | | | | | | | | | | | | | | transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
* | | | | | | | | | | | | | | CI - Allow sourcemap uploads to sentry for empty version (#5403)Bruno Barbieri2018-10-101-13/+25
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-104-9/+15
|/ / / / / / / / / / / / /
* | | | | / / / / / / / / Fix formatting of locale files (#5479)Noel Yoo2018-10-1015-956/+956
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-108-4/+330
* | | | | | | | | | | | i18n - fr - improvementsVincent2018-10-101-4/+4
* | | | | | | | | | | | Fixed lint errorsSantiago Gonzalez Toral2018-10-101-11/+11
* | | | | | | | | | | | Added account options on home screenSantiago Gonzalez Toral2018-10-1010-4/+208
* | | | | | | | | | | | Merge pull request #5465 from alextsg/fix-valuesAlexander Tseung2018-10-102-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix token values being undefinedAlexander Tseung2018-10-092-3/+8
* | | | | | | | | | | | update package-lock.jsonbrunobar792018-10-101-28/+24
* | | | | | | | | | | | bump eth-json-rpc-middlewarebrunobar792018-10-101-1/+1
* | | | | | | | | | | | Fix Korean typos (#5472)Noel Yoo2018-10-101-7/+7
* | | | | | | | | | | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-107-100/+239
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | workaround - fix for drizzlekumavis2018-10-091-2/+11
| * | | | | | | | | | | | deps - bump inpage-provider for drizzle workaroundkumavis2018-10-092-4/+4
| * | | | | | | | | | | | deps - bump metamask-inpage-provider for bug fixkumavis2018-10-092-101/+4
| * | | | | | | | | | | | provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-094-8/+8
| * | | | | | | | | | | | provider - enable subscription support (newHeads, logs)kumavis2018-10-084-92/+303
| * | | | | | | | | | | | deps - bump eth-block-tracker for safe-event-emitterkumavis2018-10-042-9/+25
* | | | | | | | | | | | | 100% French locale, reordering of English locale, fixes #5457 (#5470)Vincent2018-10-094-126/+805
* | | | | | | | | | | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-094-4/+4
* | | | | | | | | | | | | Fix typos (#5471)Noel Yoo2018-10-094-5/+5
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5461 from eduadiez/developThomas Huang2018-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added webRequest.RequestFilter to filter main_frame .eth requestsEduardo AntuƱa Dƭez2018-10-091-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5442 from whymarrh/fix-page-container-footerWhymarrh Whitby2018-10-063-64/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix markup for inline instances of `PageContainer`sWhymarrh Whitby2018-10-063-64/+64
* | | | | | | | | | | | | Merge pull request #5440 from alextsg/fix-translateAlexander Tseung2018-10-064-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix action translations edge casesAlexander Tseung2018-10-064-2/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5428 from alextsg/i5372-queue-orderDan Finlay2018-10-062-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reverse pending transactions orderAlexander Tseung2018-10-052-3/+3
* | | | | | | | | | | | | Merge pull request #5438 from MetaMask/update-balance-on-unlockDan Finlay2018-10-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into update-balance-on-unlockDan Finlay2018-10-063-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove package-lock changesDan Finlay2018-10-061-163/+154
* | | | | | | | | | | | | | Fix updating of pending transactionsDan Finlay2018-10-064-154/+167
| * | | | | | | | | | | | | Update all balances on password unlockDan Finlay2018-10-061-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5432 from alextsg/i5362-fix-translateDan Finlay2018-10-067-20/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Translate method names in the transaction list only when applicableAlexander Tseung2018-10-057-20/+111
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5427 from alextsg/i5371-update-cancel-copyAlexander Tseung2018-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update "cancel" copyAlexander Tseung2018-10-051-1/+1
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-052-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5412 from whymarrh/after-install-stepsWhymarrh Whitby2018-10-041-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't open metamask.io after install anymoreWhymarrh Whitby2018-10-021-9/+0
* | | | | | | | | | | | | Merge pull request #5419 from whymarrh/remove-copy-contract-addressWhymarrh Whitby2018-10-045-23/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove "Copy Contract Address" from token optionsWhymarrh Whitby2018-10-045-23/+2
* | | | | | | | | | | | | fix typos (#5418)satboy782018-10-041-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5406 from whymarrh/bypass-phishing-warningDan Finlay2018-10-026-4/+116
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Style links on phishing page with an underlineWhymarrh Whitby2018-10-021-0/+1
| * | | | | | | | | | | Style links on phishing page with cursor: pointer;Whymarrh Whitby2018-10-021-0/+1
| * | | | | | | | | | | Hook MetaMaskController up with phishing detection pageWhymarrh Whitby2018-10-022-2/+60
| * | | | | | | | | | | Add domain whitelist method to MetaMaskControllerWhymarrh Whitby2018-10-021-0/+11
| * | | | | | | | | | | Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-022-0/+37
| * | | | | | | | | | | Update title and copy of phishing warning pageWhymarrh Whitby2018-10-021-2/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5409 from MetaMask/provider-fix-url-authThomas Huang2018-10-022-189/+167
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bugfix - bump provider for url auth supportkumavis2018-10-022-189/+167
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5329 from whymarrh/confirm-featuresWhymarrh Whitby2018-10-0213-25/+260
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Only use current network txs when calculating "Reject All"Whymarrh Whitby2018-10-021-1/+6
| * | | | | | | | | | | Switch page-container__footer-* for header and footer tagsWhymarrh Whitby2018-10-023-27/+27
| * | | | | | | | | | | Reword batch reject confirm as "Reject All"Whymarrh Whitby2018-10-022-1/+4
| * | | | | | | | | | | Confirm rejecting multiple transactions with modalWhymarrh Whitby2018-10-028-4/+103
| * | | | | | | | | | | s/Cancel/Reject/ on confirm screen for clarityWhymarrh Whitby2018-10-022-1/+8
| * | | | | | | | | | | Add "Cancel All" button to confirm footerWhymarrh Whitby2018-10-025-4/+82
| * | | | | | | | | | | Have PageContainerFooter take children nodeWhymarrh Whitby2018-10-023-21/+64
* | | | | | | | | | | | Merge pull request #5380 from whymarrh/send-with-hex-dataWhymarrh Whitby2018-10-0215-29/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Recipient not required on send screen when hex data presentWhymarrh Whitby2018-10-015-4/+17
| * | | | | | | | | | | | Rework estimateGas logicWhymarrh Whitby2018-10-011-10/+10
| * | | | | | | | | | | | Update gas when hex data changes on send screenWhymarrh Whitby2018-10-019-14/+56
| * | | | | | | | | | | | Update send.utils.test to with better mocksWhymarrh Whitby2018-10-011-5/+8
| * | | | | | | | | | | | Allow sending transactions with hex data and no recipientWhymarrh Whitby2018-10-011-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5400 from whymarrh/dot-only-hunterWhymarrh Whitby2018-10-022-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | npm uninstall dot-only-hunterWhymarrh Whitby2018-10-012-7/+0
| * | | | | | | | | | | Remove dot-only-hunter from test:unit scriptWhymarrh Whitby2018-10-011-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5402 from whymarrh/fix-e2e-testsWhymarrh Whitby2018-10-012-17/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix error message shown in assertElementNotPresent e2e helper fnWhymarrh Whitby2018-10-011-3/+1
| * | | | | | | | | | | Don't log errors extraneously in e2e testsWhymarrh Whitby2018-10-011-1/+0
| * | | | | | | | | | | Update e2e tests for adding mutliple custom RPC endpointsWhymarrh Whitby2018-10-011-12/+2
| * | | | | | | | | | | Switch string concatenation to template stringWhymarrh Whitby2018-10-011-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Improvement: Reposition customize gas error (#5265)Sean2018-10-011-2/+4
* | | | | | | | | | | Merge pull request #5325 from sam-aldis/patch-1Dan Finlay2018-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Debounce was breaking in updateUKJP Design2018-09-231-1/+1
* | | | | | | | | | | | support editable customRPC (#5267)HackyMiner2018-09-296-7/+49
* | | | | | | | | | | | Merge pull request #5271 from farahbrunache/developkumavis2018-09-282-0/+1241
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | i18n - ht - fix json formattingkumavis2018-09-281-4/+1
| * | | | | | | | | | | i18n - index - fix whitespacekumavis2018-09-281-21/+21
| * | | | | | | | | | | fixed quotes in line 749Farah Brunache2018-09-211-1/+1
| * | | | | | | | | | | fixed some grammatical errorsFarah Brunache2018-09-171-15/+13
| * | | | | | | | | | | added Haitian Creole translationsFarah Brunache2018-09-162-20/+1266
* | | | | | | | | | | | Merge pull request #5383 from MetaMask/Version-4.12.0Dan Finlay2018-09-283-15/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Correct changelog datev4.12.0Dan Finlay2018-09-281-1/+1