aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* Tx controller now uses safe event emitter (#5769)Frankie2018-11-173-3/+3
* Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-153-2/+22
* 1102: use meta title if it exists before titlePaul Bouchon2018-11-151-0/+5
* Update Balanc3 API (#5744)Paul Bouchon2018-11-142-23/+16
* Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-141-0/+1
* EIP-1102: Update publicConfig store concurrently with approvalPaul Bouchon2018-11-103-33/+29
* 1102: Fix inpage listener syntax (#5708) (#5709)Noah I2018-11-091-2/+2
* Cleanupbitpshr2018-11-081-18/+10
* 1102: use postMessage instead of injected scripts to bypass CSPbitpshr2018-11-081-17/+13
* wipbitpshr2018-11-082-24/+39
* Fix lint errorsbitpshr2018-11-071-1/+1
* Remove injected script tags after usebitpshr2018-11-071-0/+2
* Clear cached approval after rejectionbitpshr2018-11-072-8/+11
* 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-062-18/+52
* 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
* 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
* EIP-1102: add user privacy optionbitpshr2018-11-064-44/+32
* EIP-1102: add isEnabled convenience method to providerbitpshr2018-11-063-9/+53
* EIP-1102: Add option to force-enable providerbitpshr2018-11-064-6/+44
* EIP-1102: updated implementationbitpshr2018-11-067-28/+182
* network - infura - hardcode net_version and eth_chainId (#5670)kumavis2018-11-061-0/+33
* Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-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 #5560 from MetaMask/sentry-enhancements2kumavis2018-10-307-60/+112
|\
| * Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension...kumavis2018-10-301-2/+3
| |\
| | * Merge branch 'develop' into sentry-enhancements2kumavis2018-10-3011-161/+265
| | |\
| * | \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-3012-187/+275
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-212-28/+27
| |\ \ \
| * | | | sentry - include app state in ui errorskumavis2018-10-202-2/+18
| * | | | sentry - replace raven-js with sentry/browserkumavis2018-10-204-49/+39
| * | | | 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
| * | | | currency - throw errors on failurekumavis2018-10-191-3/+17
| * | | | blacklist - throw errors on request/parse failurekumavis2018-10-191-4/+19
| * | | | sentry - move isBrave decoration to insides of try-catchkumavis2018-10-191-1/+2
* | | | | Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-301-9/+26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB...kumavis2018-10-268-125/+121
| |\ \ \ \
| * | | | | tx-gas-util - set error message when invalidating tx based on tx data but no ...kumavis2018-10-211-4/+5
| * | | | | Merge branch 'develop' into developkumavis2018-10-219-38/+160
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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-101-5/+6
| * | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-101-7/+16
* | | | | | Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-302-27/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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-2611-179/+269
| |\ \ \ \ \
| * | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | preferences - fix typokumavis2018-10-301-1/+1
| |/ / / / |/| | | |
* | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-264-33/+128
| |/ / / |/| | |
* | | | ens-ipfs - refactor for readability (#5568)kumavis2018-10-217-124/+120
* | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | add support for wallet_watchAssetEsteban MIno2018-10-201-1/+1
| |/ /
* / / specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-202-28/+27
|/ /
* | inpage - increase provider max listeners to avoid warningskumavis2018-10-181-0/+2
* | Merge pull request #5127 from MetaMask/account-tracker-network-changekumavis2018-10-181-1/+7
|\ \
| * \ Merge branch 'develop' into account-tracker-network-changekumavis2018-09-2817-419/+480
| |\ \
| * | | metamask controller - force account tracker to update balances on network changekumavis2018-08-231-0/+4
* | | | 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-172-0/+31
* | | | | Fix document extension check when injecting web3Whymarrh Whitby2018-10-161-7/+12
* | | | | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-162-1/+39
|/ / / /
* | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-0/+4
* | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5...Whymarrh Whitby2018-10-111-23/+1
* | | | transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
* | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-101-1/+1
| |_|/ |/| |
* | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-105-15/+36
|\ \ \
| * | | workaround - fix for drizzlekumavis2018-10-091-2/+11
| * | | provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-092-4/+4
| * | | provider - enable subscription support (newHeads, logs)kumavis2018-10-082-9/+21
* | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-092-2/+2
* | | | Added webRequest.RequestFilter to filter main_frame .eth requestsEduardo Antuña Díez2018-10-091-1/+1
* | | | Merge branch 'develop' into update-balance-on-unlockDan Finlay2018-10-062-0/+2
|\ \ \ \
| * | | | Fix updating of pending transactionsDan Finlay2018-10-062-0/+2
* | | | | Update all balances on password unlockDan Finlay2018-10-061-0/+1
|/ / / /
* | | | Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
* | | | 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
* | | | 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-021-0/+22
|/ / /
* | / support editable customRPC (#5267)HackyMiner2018-09-292-7/+15
| |/ |/|
* | Update extension badge with correct signTypedData countWhymarrh Whitby2018-09-271-0/+1
* | fix tld bug (#5250)Phyrex Tsai2018-09-271-0/+2
* | Merge pull request #5053 from hahnmichaelf/esdb-supportThomas Huang2018-09-272-1/+6
|\ \
| * | additional lint-test fixhahnmichaelf2018-08-141-1/+1
| * | fix for lint-testhahnmichaelf2018-08-142-3/+3
| * | change namehahnmichaelf2018-08-141-0/+0
| * | base - working. fixes #4774hahnmichaelf2018-08-132-1/+6
* | | EIP-1102: Add deprecation message (#5353)Paul Bouchon2018-09-262-6/+6
* | | bugfix: update eth_signTypedData_v3 parameter orderbitpshr2018-09-261-4/+4
* | | Fix MetaMask web3 version (#5352)Esteban Miño2018-09-261-0/+1
* | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-251-2/+3
|\ \ \
| * | | Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-201-2/+3
* | | | Adds getPendingNonce method to provider initialization options in metamask-co...Dan Miller2018-09-222-1/+15
|/ / /
* | | Merge branch 'develop' into eip-712Paul Bouchon2018-09-181-0/+19
|\ \ \
| * | | EIP-1102: Transitionary API (#5256)Paul Bouchon2018-09-151-0/+19
* | | | Update new method namespace from v2 to v3bitpshr2018-09-142-3/+3
* | | | Update error message for chainId mis-matchbitpshr2018-09-141-1/+1
* | | | Implement latest EIP-712 protocolbitpshr2018-09-142-39/+112
|/ / /
* | | Merge pull request #5240 from MetaMask/i5238-account-balance-updateDan Finlay2018-09-121-0/+3
|\ \ \
| * | | Ensure account-tracker currentBlockNumber is set on first block update.Dan Miller2018-09-111-0/+3
* | | | Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-121-1/+1
* | | | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-124-341/+27
|/ / /
* | | Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-113-2/+73
|\ \ \
| * | | Add createCancelTransaction methodAlexander Tseung2018-09-113-2/+73
* | | | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-111-0/+1
|\ \ \ \
| * | | | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
| |/ / /
* / / / Upgrade obs-store and fix memory leaksConnor Christie2018-09-101-3/+7
|/ / /
* | | fix conflictsEsteban MIno2018-08-294-18/+69
|\ \ \
| * | | Do not resolve .test domains using ENSbitpshr2018-08-251-1/+1
| * | | updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-1/+1
| * | | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-1/+1
| * | | Merge pull request #5122 from MetaMask/lazy-account-trackerDan Finlay2018-08-232-2/+37
| |\ \ \
| | * | | Add todo to dedupe UI tracking in backgroundDan Finlay2018-08-231-0/+1
| | * | | account-tracker - only track blocks when there are activeControllerConnectionskumavis2018-08-222-2/+24
| | * | | metamask controller - track active controller connectionskumavis2018-08-221-0/+12
| | | |/ | | |/|
| * / | Update unlock logic to not overwrite existing selected addressWhymarrh Whitby2018-08-231-13/+29
| |/ /
* | | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | | delete web3.metamassk.watchAssetEsteban MIno2018-08-241-17/+0
* | | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-6/+6
* | | expose web3.metamask.watchAssetEsteban MIno2018-08-231-0/+17
* | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-229-279/+10
|\| |
| * | Merge pull request #5109 from MetaMask/MoveOutInpageProviderDan Finlay2018-08-227-276/+4
| |\ \
| | * | Move inpage-provider and port-stream outsideDan Finlay2018-08-217-276/+4
| * | | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-221-1/+1
| |\ \ \
| | * | | bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-221-1/+1
| | |/ /
| * | | fix hardware wallets account namebrunobar792018-08-211-1/+3
| * | | fix account removalbrunobar792018-08-211-1/+2
| |/ /
* | | returning error in watchAssetEsteban MIno2018-08-221-4/+12
* | | refactor watchToken related functionsEsteban MIno2018-08-211-37/+36
* | | watchAsset returns result wether token was added or notEsteban MIno2018-08-213-10/+30
* | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2126-460/+652
|\| |
| * | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-2/+47
| |\ \
| | * | Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-2/+47
| | * | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1512-27/+176
| | |\|
| | * | Merge branch 'network-remove-provider-engine' into network-remove-provider-en...frankiebee2018-08-071-1/+1
| | |\ \
| | | * | network - fix blockTracker reference to return the blockTrackerProxy instead ...frankiebee2018-08-071-1/+1
| | * | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-023-9/+11
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2619-25/+574
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0425-51/+50
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0314-82/+144
| | |\ \ \ \ \
| | * | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | * | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...kumavis2018-06-133-37/+4
| | * | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | * | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST...kumavis2018-06-121-1/+2
| | * | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-1/+3
| | * | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| | * | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-081-2/+2
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-082-0/+15
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-074-1/+44
| | |\ \ \ \ \ \ \
| | * | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0711-23/+265
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| | * | | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| | * | | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | * | | | | | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| | * | | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| | * | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-294-96/+69
| | * | | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
| | * | | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| | * | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
| | * | | | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-254-64/+110
| | * | | | | | | | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
| | * | | | | | | | | account-tracker - guard against empty blockkumavis2018-05-251-1/+2
| | * | | | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
| | * | | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
| | * | | | | | | | | Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask...kumavis2018-05-242-9/+24
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2311-66/+176
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
| | | | * | | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | * | | | | | | | | | | | sentry - setupRaven - ensure message is truthykumavis2018-05-241-2/+2
| | * | | | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4kumavis2018-05-241-67/+56
| | * | | | | | | | | | | controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+7
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2310-51/+169
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| | * | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| | * | | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-174-4/+4
| | * | | | | | | | | | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
| | * | | | | | | | | | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
| | * | | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-172-43/+0
| | * | | | | | | | | | | lint fixkumavis2018-05-175-13/+18
| | * | | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-178-70/+217
| * | | | | | | | | | | | fix merge conflictsbrunobar792018-08-1821-369/+489
| * | | | | | | | | | | | remove console logsbrunobar792018-08-151-7/+1
| * | | | | | | | | | | | fixed unit testsbrunobar792018-08-151-0/+6
| * | | | | | | | | | | | fix tx testsbrunobar792018-08-142-5/+5
| * | | | | | | | | | | | legacy and new hd path workingbrunobar792018-08-141-1/+2
| * | | | | | | | | | | | good progress adding pathsbrunobar792018-08-141-8/+11
| * | | | | | | | | | | | clean upbrunobar792018-08-124-43/+4
| * | | | | | | | | | | | this should be ready to gobrunobar792018-08-122-323/+3
| * | | | | | | | | | | | clean upbrunobar792018-08-121-45/+36
| * | | | | | | | | | | | message signing worksbrunobar792018-08-122-6/+18
| * | | | | | | | | | | | workingbrunobar792018-08-122-24/+14
| * | | | | | | | | | | | tx signature is validbrunobar792018-08-121-0/+1
| * | | | | | | | | | | | tx signing should workbrunobar792018-08-121-10/+39
| * | | | | | | | | | | | rename keyringbrunobar792018-08-111-1/+1
| * | | | | | | | | | | | able to add accountsbrunobar792018-08-112-37/+104
| * | | | | | | | | | | | iframe communication workingbrunobar792018-08-115-46/+208
| * | | | | | | | | | | | refactor to support multiple hw walletsbrunobar792018-08-112-75/+160
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-114-2/+47
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | code review changesbrunobar792018-08-082-0/+40
| | * | | | | | | | | | | fix merge conflictsbrunobar792018-08-085-18/+122
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | send to fullscreen if no permission from popupbrunobar792018-07-311-1/+6
| | * | | | | | | | | | | | use existing modalsbrunobar792018-07-311-1/+1
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1Dan Finlay2018-08-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fix migration 28Esteban MIno2018-08-101-2/+2
| * | | | | | | | | | | | | sentry - change releaseVersion to releaseJenny Pollack2018-08-102-4/+4
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Avoid overwriting a domain that can be resolved by DNSEduardo Antuña Díez2018-08-091-2/+2
| * | | | | | | | | | | | Fixed ENS to IPFS functionality in FirefoxEduardo Antuña Díez2018-08-091-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | delete according image when token added with watchToken deletedEsteban MIno2018-08-171-13/+14
* | | | | | | | | | | | correct behavior when notification is closed when popupEsteban MIno2018-08-171-1/+1
* | | | | | | | | | | | show watch asset image from hide token modalEsteban MIno2018-08-161-1/+1
* | | | | | | | | | | | change watchAsset to new spec for type ERC20Esteban MIno2018-08-161-15/+27
* | | | | | | | | | | | add suggested tokens objects in metamask stateEsteban MIno2018-08-161-6/+16
* | | | | | | | | | | | watchToken to watchAssetEsteban MIno2018-08-151-1/+1
* | | | | | | | | | | | add support for images base64 and urls on new uiEsteban MIno2018-08-151-6/+7
* | | | | | | | | | | | update method to metamask_watchTokenEsteban MIno2018-08-151-1/+1
* | | | | | | | | | | | refactor unused codeEsteban MIno2018-08-081-2/+4
* | | | | | | | | | | | fix mergeEsteban MIno2018-08-081-0/+1
* | | | | | | | | | | | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-085-18/+122
|\| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 03:07:00 +0800