aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove error flags from drizzle setupbrunobar792018-11-151-4/+0
|
* Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-156-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add beginning of test * Resubmit approved transactions on new block May fix #4343 and related issues, where an error could leave transactions stranded in the approved state. * Remove unused test * Re-approve transactions when retrying approved * Add retry approved test * Include approved in pending tx count * Fix getPendingTxs() * Linted * Only throw hash error in submitted state * Only check submitted txs for block inclusion * Fix test expectations
* 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 balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* Update support links to zendesk (#5745)Bruno Barbieri2018-11-142-2/+2
| | | | | | * Fix loose accounts help link * Update support site link
* 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
| | | | | | * Fix Slovenian translation * Add Slovak translation
* 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
|\ | | | | e2e tests for responsive behaviour
| * 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 ↵Alexander Tseung2018-11-102-4/+4
| | | | | | | | (#5710)
* | 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.js
| * | 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
|\ \ \ | | | | | | | | tests/Reducers
| * | | 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 ↵Thomas2018-10-312-23/+96
| | | | | | | | | | | | | | | | dispatched
| * | | 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 typo on drizzle test description
| * | | | fix typobrunobar792018-11-071-1/+1
|/ / / /
* | | | Merge pull request #5689 from MetaMask/reject-cached-approvalBruno Barbieri2018-11-074-13/+33
|\ \ \ \ | | | | | | | | | | EIP-1102: Clear approvals on rejection
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Parameterize NetworkDisplay background colour * Update design for login request screen * Pass siteTitle, siteImage through for calls to ethereum.enable() * Bring the site images closer together
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | * network - infura - hardcode net_version and eth_chainId * network - infura - add rinkeby handling * lint fix
* | | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-062-2/+28
| |_|/ |/| | | | | | | | | | | | | | * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions
* | | Merge pull request #5671 from MetaMask/i18n-tool-fixkumavis2018-11-051-1/+1
|\ \ \ | | | | | | | | development tools - i18n verify tool - bugfix
| * | | 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 command
| * | | | CI - job-publish-release - fix github commandkumavis2018-11-021-2/+2
| | | | | | | | | | | | | | | correctly set github username and email
* | | | | Merge pull request #5659 from MetaMask/token-rates-bugfixkumavis2018-11-041-4/+7
|\ \ \ \ \ | | | | | | | | | | | | token-rates - protect against bad token data
| * | | | | 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/develop
| * \ \ \ Merge pull request #5649 from MetaMask/developkumavis2018-11-02143-2196/+3782
| |\ \ \ \ | |/ / / / |/| | | | Version 4.17.0
* | | | | Merge pull request #5648 from MetaMask/v4.17.0kumavis2018-11-022-2/+10
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | Version 4.17.0
| * | | 4.17.0v4.17.0kumavis2018-11-022-2/+10
|/ / /
* | | fixed currency-display (#5619)HackyMiner2018-10-302-3/+22
| | | | | | | | | * call getValueFromWeiHex() with fromCurrency=nativeCurrency
* | | Merge pull request #5560 from MetaMask/sentry-enhancements2kumavis2018-10-3010-80/+185
|\ \ \ | | | | | | | | Sentry - various enhancements to help debugging (alternate)
| * \ \ Merge branch 'sentry-enhancements2' of ↵kumavis2018-10-301-2/+3
| |\ \ \ | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into sentry-enhancements2
| | * \ \ Merge branch 'develop' into sentry-enhancements2kumavis2018-10-30128-2035/+3082
| | |\ \ \
| * | \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-30129-2108/+3130
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | sentry-enhancements2
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-218-58/+436
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | sentry-enhancements2
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Feature: Warn when attempting to send tx with data to non-contract
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-2666-1692/+1809
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | HowardBraham-develop
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contract code
| * | | | | | | send tx - validate - simplify error message for attempting to call function ↵kumavis2018-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on non-contract address
| * | | | | | | 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 ↵Howard Braham2018-10-104-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ganache-core v2.2.1 and below will return the non-standard '0x0'
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Validate signTypedData signer/address in eth-json-rpc-middleware
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | network - check eth_chainId and fallback to net_version
| * \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get the real chainId using eth_chainId and use net_version as a fallback
* | | | | | | | | | Merge pull request #5625 from filips123/developkumavis2018-10-301-105/+658
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | i18n - Better Slovenian translation
| * | | | | | | | | | 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 typo
| * | | | | | | | | 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 ↵Alexander Tseung2018-10-2521-147/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component (#5599)
* | | | | | | | Fix UnknownFunction showing as Confirm (#5590)Alexander Tseung2018-10-241-0/+11
| |/ / / / / / |/| | | | | |
* | | | | | | Add Activity Log entry for onchain failures for a transaction. Change ↵Alexander Tseung2018-10-2315-112/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling of the transaction list. Remove Transaction Details modal. (#5581)
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | i18n - Updated Dutch translation for main network name
| * | | | | | | Updated translation for main network nameMarijn Bent2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Current translation translates to 'most important Ethereum-network'. 'Main' is totally acceptable to use in Dutch.
* | | | | | | | Fix signature request styling issues (#5574)Alexander Tseung2018-10-231-1/+1
| | | | | | | |
* | | | | | | | i18n - update haitian translations (#5565)kumavis2018-10-232-1235/+1312
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * addedd new keys and updated translations to Haitian Creole * changelog - add entry for hatian creole fix
* | | | | | | Merge pull request #5570 from alextsg/i5558-account-display-widthkumavis2018-10-2113-44/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix account display width for large currency values
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Avoid truffle touching our package.json
| * | | | | | | install truffle globallybrunobar792018-10-211-1/+1
| | | | | | | |
* | | | | | | | ens-ipfs - refactor for readability (#5568)kumavis2018-10-218-125/+131
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ens-ipfs - refactor for readability * ens-ipfs - use official ipfs gateway for better performance * lint - remove unused code * ens-ipfs - support path and search * lint - gotta love that linter * ens-ipfs - improve loading page formatting * ens-ipfs - loading - redirect to 404 after 1 min timeout * ens-ipfs - destructure for cleaner code
* | | | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-212-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support for prefix wallet_watchAsset
| * | | | | | | add support for wallet_watchAssetEsteban MIno2018-10-202-1/+6
| | |/ / / / / | |/| | | | |
* | | | | | | i18n - use localized names in language selectionBrandon Wissmann2018-10-212-22/+22
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4250 (#5559) * Added localized names for languages * Capital letter for Čeština * capital letter Русский * i18n - use localized names in language selection * fix build * package-lock.json build fix
* | | | | | Merge pull request #5543 from MetaMask/shapeshift-list-itemThomas Huang2018-10-201-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Shapeshift logo url and adjust list item contents
| * | | | | | 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.0
| * | | | | | | 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 master into develop
| * | | | Merge pull request #5539 from MetaMask/v4.16.0kumavis2018-10-18115-995/+4688
| |\ \ \ \ | | | | | | | | | | | | Version 4.16.0
| | * | | | 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 warnings
| * | | | 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
|\ \ \ \ | | | | | | | | | | Bug Fix: Force AccountTracker to update balances on network change
| * \ \ \ 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add clarifying text to the "Add Token" button
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | debugging - enable fetch debugging
| * | | | | | enable fetch debuggingkumavis2018-10-152-0/+37
| | | | | | |
* | | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-1785-653/+2466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add UnitInput component * Add CurrencyInput component * Add UserPreferencedCurrencyInput component * Add UserPreferencedCurrencyDisplay component * Add updatePreferences action * Add styles for CurrencyInput, CurrencyDisplay, and UnitInput * Update SettingsTab page with Primary Currency toggle * Refactor currency displays and inputs to use UserPreferenced displays and inputs * Add TokenInput component * Add UserPreferencedTokenInput component * Use TokenInput in the send screen * Fix unit tests * Fix e2e and integration tests * Remove send/CurrencyDisplay component * Replace diamond unicode character with Eth logo. Fix typos
* | | | | | | Merge pull request #5534 from whymarrh/i18n-warningsWhymarrh Whitby2018-10-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Lower i18n-helper#getMessage log level from error to warning
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update wording on export private key modal
| * | | | | | | 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 web3
| * | | | | | | 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 screen
| * | | | | | | | 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 README
| * | | | | | | Remove greenkeeper badge from READMEThomas2018-10-161-1/+1
| | | | | | | |
* | | | | | | | add tooltip for view etherscan tx (#5518)Michael J. Cohen2018-10-161-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tooltip for view etherscan tx * run lint
* | | | | | | | Merge pull request #5521 from MetaMask/deps-old-ethjs-fixkumavis2018-10-162-92/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bug fix - bump eth-token-tracker for ethjs-rpc bug in deps
| * | | | | | | | 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
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add more korean translation * Improve korean translation
* | | | | | | 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
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new english messages * Update translation * Update changelog * Fix casing of MetaMask
* | | | | | 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
| | | |\ \ \ | |_|_|/ / / |/| | | | | Version 4.14.0
* | | | | | Merge pull request #5511 from MetaMask/merge-masterkumavis2018-10-122-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge master into develop (resolves merge conflict)
| * | | | | | 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.0
| | * | | | | 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 subdomain
| * | | | | | 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.0
| * | | | | | | Version 4.14.0v4.14.0Dan Finlay2018-10-122-1/+4
| | | | | | | |
* | | | | | | | Fix en, ko locales (#5483)Noel Yoo2018-10-112-49/+49
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix en typo * Fix ko typo * Remove unnecessary space * Fix ko typo * Improve translation in ko
* | | | | | | Merge pull request #5494 from whymarrh/fix-seed-phrase-screenThomas Huang2018-10-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix styling of first-time-flow container
| * | | | | | | 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 address
| * | | | | | | 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 txReceipt merge
| * | | | | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs ↵Whymarrh Whitby2018-10-111-23/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3.
* | | | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-105-141/+1643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Actions.spec.js * Error handling tests * Lint
* | | | | | | Merge pull request #5480 from noelyoo/typokumavis2018-10-102-236/+236
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Alphabetize locales keys
| * | | | | | | 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
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow sourcemap uploads to sentry for empty version * Fix comments * fix console log msgs * fix console log msgs * clean up * fix linter errors
* | | | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-104-9/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make all addresses EIP-55 compliant * Checksum autocompleted address but not during input
* | | | | / Fix formatting of locale files (#5479)Noel Yoo2018-10-1015-956/+956
| |_|_|_|/ |/| | | |
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-108-4/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added drizzle app for testing * working * clean up * clean up script * make build step required * add drizzle-tests to .eslintignore * clean up drizzle run script * lint * use truffle unbox * undo eslintignore changes * revert change * dont use global * dont need this steps * use the new account flow * restore package-lock.json
* | | | | i18n - fr - improvementsVincent2018-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * french locales: fix typos and improve wording * french locales: more fixes and rewording * fixed typo * fixed typo * added missing translations * fixed alphabetical order * fixed alphabetical order * added missing translations for FR * fixed verify-locale-strings.js * fixed indentation * fixed indentation * updated french locale * updated changelog with changes logs * a few fixes after receiving comments, mostly Caps removing and adding * translated 2 missing french locale words and also remove a caps * Update messages.json * Update messages.json
* | | | | 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 undefined
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Feature: Subscription support
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * french locales: fix typos and improve wording * french locales: more fixes and rewording * fixed typo * fixed typo * added missing translations * fixed alphabetical order * fixed alphabetical order * added missing translations for FR * fixed verify-locale-strings.js * fixed indentation * fixed indentation * updated french locale * updated changelog with changes logs * a few fixes after receiving comments, mostly Caps removing and adding
* | | | | | 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 requests
| * | | | | 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 PageContainers
| * | | | | 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 cases
| * | | | | 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 order
| * | | | | Reverse pending transactions orderAlexander Tseung2018-10-052-3/+3
| | | | | |
* | | | | | Merge pull request #5438 from MetaMask/update-balance-on-unlockDan Finlay2018-10-061-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update all balances on password unlock
| * \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction statuses were not being properly updated when: - MetaMask was unlocked - The network was changed This PR fixes both of those. Fixes #5174
| * | | | | | 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 applicable
| * | | | | | Translate method names in the transaction list only when applicableAlexander Tseung2018-10-057-20/+111
| |/ / / / /