aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
|\ | | | | Bug Fix: Force AccountTracker to update balances on network change
| * 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
|\ \ \ | | | | | | | | debugging - enable fetch debugging
| * | | enable fetch debuggingkumavis2018-10-152-0/+37
| | | |
* | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-172-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | 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 ↵Whymarrh Whitby2018-10-111-23/+1
| | | | | | | | | | | | | | | | | | (#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-105-15/+36
|\ \ \ | | | | | | | | Feature: Subscription support
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|/ / / /
* | | | Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Increase suggested gas percentile to 65 I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough. * Update test for getGasPrice
* | | | Merge pull request #5412 from whymarrh/after-install-stepsWhymarrh Whitby2018-10-041-9/+0
|\ \ \ \ | |/ / / |/| | | Don't open MetaMask website after install
| * | | 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
| |/ |/| | | | | | | | | * support editable customRPC #5246 * remove rpcList size restriction
* | 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
|\ \ | | | | | | Link to ESDB in local phishing.html
| * | 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
|\ \ \ | | | | | | | | Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
| * | | Switch existing modals from using Notification to Modal. Remove Notification ↵Alexander Tseung2018-09-201-2/+3
| | | | | | | | | | | | | | | | component. Add CancelTransaction modal
* | | | Adds getPendingNonce method to provider initialization options in ↵Dan Miller2018-09-222-1/+15
|/ / / | | | | | | | | | metamask-controller.
* | | 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.
| * | | 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 method
| * | | Add createCancelTransaction methodAlexander Tseung2018-09-113-2/+73
| | | |
* | | | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-111-0/+1
|\ \ \ \ | | | | | | | | | | Show transaction error message tooltips for statuses
| * | | | 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
| |\ \ \ | | | | | | | | | | Network IO Optimization: Lazy AccountTracker
| | * | | 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 outside
| | * | Move inpage-provider and port-stream outsideDan Finlay2018-08-217-276/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream. To reduce the size of its dependencies, I have moved the [metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream). This allows them to be more easily depended & iterated on by external projects.
| * | | Merge pull request #5118 from MetaMask/provider2-bugfixDan Finlay2018-08-221-1/+1
| |\ \ \ | | | | | | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated
| | * | | 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
| | |\| | | | | | | | | | | | | Override package-lock and fix merge conflicts
| | * | Merge branch 'network-remove-provider-engine' into ↵frankiebee2018-08-071-1/+1
| | |\ \ | | | | | | | | | | | | | | | network-remove-provider-engine-tests
| | | * | network - fix blockTracker reference to return the blockTrackerProxy instead ↵frankiebee2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | of the direct blockTracker reference
| | * | | 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 ↵kumavis2018-07-0425-51/+50
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-0314-82/+144
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | | | | | | |
| | * | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵kumavis2018-06-133-37/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware order
| | * | | | | | 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 ↵kumavis2018-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | METAMASK_TEST_CONFIG
| | * | | | | | 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 ↵kumavis2018-06-082-0/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-074-1/+44
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-0711-23/+265
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | | 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 ↵kumavis2018-05-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account
| | * | | | | | | | | 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 ↵kumavis2018-05-261-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block is truthy
| | * | | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| | | | | | | | | | |
| | * | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet ↵kumavis2018-05-251-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware reference before txController is instantiated
| | * | | | | | | | | 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 ↵kumavis2018-05-242-9/+24
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into network-remove-provider-engine
| | | * \ \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Transactions use new block tracker
| | | | * \ \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-05-2311-66/+176
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
| | | | * | | | | | | | | | 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 ↵kumavis2018-05-231-15/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-2310-51/+169
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | QR Code Scanner
| | * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes migration 28
| | * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it. changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
| * | | | | | | | | | | | Fixed ENS to IPFS functionality in FirefoxEduardo Antuña Díez2018-08-091-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | `tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
* | | | | | | | | | | | 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
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-081-0/+5
| |\| | | | | | | | | |
| * | | | | | | | | | | fix doc tagEsteban MIno2018-08-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | tokens related functions refactorEsteban MIno2018-08-011-15/+22
| | | | | | | | | | | |
| * | | | | | | | | | | fix undefined for tokens on testsEsteban MIno2018-08-011-1/+3
| | | | | | | | | | | |
| * | | | | | | | | | | improve commentsEsteban MIno2018-07-311-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix double state update when account changedEsteban MIno2018-07-311-5/+3
| | | | | | | | | | | |
| * | | | | | | | | | | create tokens storage when setadressesEsteban MIno2018-07-311-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | isolation of tokens related methods in preferencesEsteban MIno2018-07-311-43/+42
| | | | | | | | | | | |
| * | | | | | | | | | | passing tokens to all accounts in migrationEsteban MIno2018-07-301-3/+6
| | | | | | | | | | | |
| * | | | | | | | | | | fix migration for preferences controller tokensEsteban MIno2018-07-281-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban Miño2018-07-283-9/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refactor to accountTokensEsteban MIno2018-07-282-54/+48
| | | | | | | | | | | | |
| * | | | | | | | | | | | migration for preferences controller tokensEsteban MIno2018-07-282-0/+38
| | | | | | | | | | | | |
| * | | | | | | | | | | | add & delete tokens per networkEsteban MIno2018-07-271-10/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | tokens per network for individual accountEsteban MIno2018-07-272-15/+52
| | | | | | | | | | | | |
| * | | | | | | | | | | | preferences test fixes for tokens per accountEsteban MIno2018-07-261-9/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | add & delete tokens per accountEsteban MIno2018-07-262-8/+27
| | | | | | | | | | | | |
* | | | | | | | | | | | | add suggested token params validationEsteban MIno2018-08-071-4/+25
| | | | | | | | | | | | |
* | | | | | | | | | | | | eth_watchToken workingEsteban MIno2018-08-042-0/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | rpc-engine not crashing when eth_watchTokenEsteban MIno2018-08-041-5/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | merge developEsteban MIno2018-08-0441-89/+644
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecationDan Finlay2018-07-281-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | EIP-712: deprecation message
| | * | | | | | | | | | | Add deprecation message for eth_signTypedDatabitpshr2018-07-281-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | add phishing html page, and redirect to bundled page in-windowKelvin Tan2018-07-271-2/+3
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | tx-gas-utils - catch all errors from gas estimation
| | * | | | | | | | | | tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
| | | | | | | | | | | |
| * | | | | | | | | | | migrations - fix to include 27frankiebee2018-07-261-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamerWilliam Morriss2018-07-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | Do not inject on ani.gamer.com.tw
| | * | | | | | | | | | Merge branch 'develop' into no-inject-ani-gamerKevin Serrano2018-07-2511-45/+442
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Do not inject on ani.gamer.com.twDan Finlay2018-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4799
| * | | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-251-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #4253
| * | | | | | | | | | | Remove unneeded code from i4829-close-notifications-from-ui branch.Dan Miller2018-07-252-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Uncomment closePopupIfOpen code.Dan Miller2018-07-241-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-242-4/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | run linterbrunobar792018-07-222-2/+2
| | | | | | | | | | |
| * | | | | | | | | | fix mergeEsteban MIno2018-07-211-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-2117-27/+435
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into transaction-notificationsCsaba S2018-07-215-4/+314
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-212-1/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog
| | | * | | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-204-3/+180
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial trezor support
| | | | * | | | | | | | | | added some e2e testsbrunobar792018-07-181-1/+1
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | added tests for removeAccountbrunobar792018-07-171-2/+0
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | added more unit testsbrunobar792018-07-171-4/+3
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-171-3/+17
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-142-13/+1
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-133-1/+43
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | | * | | | | | | | | | | forget device and autiload account features addedbrunobar792018-07-121-1/+36
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | update to temp dependenciesbrunobar792018-07-121-1/+6
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | account removal is workingbrunobar792018-07-112-1/+39
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | fix trezor labelbrunobar792018-07-101-1/+1
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | added label for trezor accountsbrunobar792018-07-101-1/+3
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | fix account duplicationbrunobar792018-07-101-1/+3
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | fix all the account related bugsbrunobar792018-07-101-4/+15
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-076-0/+120
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | | * | | | | | | | | | | | UI refactorbrunobar792018-07-061-2/+4
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | lint fixbrunobar792018-07-041-2/+2
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | fix merge conflictsbrunobar792018-07-041-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0426-50/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | allow to open specific route in fullscreen modebrunobar792018-07-031-2/+5
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | fix environment detection regexbrunobar792018-07-031-1/+1
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0212-59/+162
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | | fixesbrunobar792018-06-231-3/+3
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | clean upBruno2018-06-131-16/+19
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | fix merge conflictsBruno2018-06-136-104/+65
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-133-1379/+3
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | added support for signPersonalMessageBruno2018-06-131-28/+45
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | clean upBruno2018-06-111-92/+21
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | sign transactions is pretty closeBruno2018-06-111-49/+77
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | balances workingBruno2018-06-112-4/+4
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | add account workingBruno2018-06-112-8/+13
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | clean upBruno2018-06-112-8/+15
| | | | | | | | | | | | | | | | | |