aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* EIP-1102: Transitionary API (#5256)Paul Bouchon2018-09-151-0/+19
* Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo...Alexander Tseung2018-09-131-5/+8
* Add TransactionListItemDetails componentAlexander Tseung2018-09-131-0/+3
* Add tests for TransactionActivityLog. Make changes to rendering eventsAlexander Tseung2018-09-131-0/+24
* Add ActivityLog componentAlexander Tseung2018-09-131-0/+3
* 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
|/
* Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-041-0/+6
|\
| * Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-271-0/+6
* | Merge pull request #5115 from jdetychey/patch-1Dan J Miller2018-09-041-1/+1
|\ \
| * | Typo in "send" translationJerome de Tychey2018-08-221-1/+1
* | | fix conflictsEsteban MIno2018-08-2913-153/+798
|\ \ \
| * \ \ Merge pull request #4919 from MetaMask/refactor-tx-listDan Finlay2018-08-281-1/+22
| |\ \ \ | | |_|/ | |/| |
| | * | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-241-0/+3
| | * | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-241-0/+6
| | * | Fix integration testsAlexander Tseung2018-08-241-0/+3
| | * | Use css grid for TransactionListItem for responsive layoutAlexander Tseung2018-08-241-6/+6
| | * | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-241-1/+10
| * | | Do not resolve .test domains using ENSbitpshr2018-08-252-2/+1
| |/ /
| * | update Korean translation (#4630)HackyMiner2018-08-241-124/+698
| * | 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
| * | | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-231-13/+29
| |\ \ \
| | * | | Update unlock logic to not overwrite existing selected addressWhymarrh Whitby2018-08-231-13/+29
| | |/ /
| * / / Add new variant for SenderToRecipient componentAlexander Tseung2018-08-237-9/+9
| |/ /
* | | 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-2146-501/+864
|\|
| * Update logo wordmarkAlexander Tseung2018-08-192-0/+115
| * 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 pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1621-369/+489
| | |\
| | | * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-1528-54/+251
| | | |\
| | | * \ Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-072-23/+29
| | | |\ \
| | | * \ \ 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-028-16/+104
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2640-28/+1242
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | 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-0316-83/+154
| | | |\ \ \ \ \ \
| | | * | | | | | | 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-083-0/+22
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-076-4/+86
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
| | | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0714-28/+305
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | 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-2314-67/+215
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | 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-2313-52/+208
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | 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
| | * | | | | | | | | | | | | v4.9.3v4.9.3Thomas2018-08-161-1/+1
| | * | | | | | | | | | | | | Merge pull request #5037 from MetaMask/masterDan Finlay2018-08-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | v4.9.2Thomas2018-08-101-1/+1
| * | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-1822-370/+490
| * | | | | | | | | | | | | | ui readybrunobar792018-08-171-2/+5
| * | | | | | | | | | | | | | connect screen readybrunobar792018-08-173-5/+7
| * | | | | | | | | | | | | | change Metamask for MetaMaskbrunobar792018-08-151-7/+1
| * | | | | | | | | | | | | | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-1514-26/+32
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix casing of Bitcoin, Ethereum, and Litecoin across localized messagesWhymarrh Whitby2018-08-149-11/+11
| | * | | | | | | | | | | | | Fix casing of MetaMask in all localized messagesWhymarrh Whitby2018-08-1411-16/+16
| * | | | | | | | | | | | | | remove console logsbrunobar792018-08-151-7/+1
| * | | | | | | | | | | | | | fixed unit testsbrunobar792018-08-151-0/+6
| * | | | | | | | | | | | | | ui fixesbrunobar792018-08-151-11/+8
| * | | | | | | | | | | | | | fix tx testsbrunobar792018-08-142-5/+5
| * | | | | | | | | | | | | | legacy and new hd path workingbrunobar792018-08-142-1/+8
| * | | | | | | | | | | | | | 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-117-66/+209
| * | | | | | | | | | | | | | refactor to support multiple hw walletsbrunobar792018-08-114-76/+180
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-116-2/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | code review changesbrunobar792018-08-083-0/+43
| | * | | | | | | | | | | | fix merge conflictsbrunobar792018-08-087-41/+151
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | design completebrunobar792018-08-042-2/+26
| | * | | | | | | | | | | | | added crossbrowser support and error handlingbrunobar792018-08-011-0/+6
| | * | | | | | | | | | | | | send to fullscreen if no permission from popupbrunobar792018-07-312-1/+9
| | * | | | | | | | | | | | | copybrunobar792018-07-311-1/+1
| | * | | | | | | | | | | | | use existing modalsbrunobar792018-07-312-1/+13
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | v4.9.1Thomas2018-08-101-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into developThomas2018-08-101-1/+1
| * | | | | | | | | | | | | 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-087-41/+151
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-083-23/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Show invalid seed phrase error when importing new accountWhymarrh Whitby2018-08-071-0/+3
| | * | | | | | | | | | | Update Phishing HtmlThomas2018-07-281-23/+26
| | |/ / / / / / / / / /
| * | | | | | | | | | | 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-288-16/+101
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | new confirm add suggested token componentEsteban MIno2018-08-071-0/+3
* | | | | | | | | | | | | 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-0466-100/+1409
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecationDan Finlay2018-07-281-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add deprecation message for eth_signTypedDatabitpshr2018-07-281-0/+5
| * | | | | | | | | | | | Merge pull request #4893 from kelvintyb/developThomas Huang2018-07-284-3/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | add phishing html page, and redirect to bundled page in-windowKelvin Tan2018-07-274-3/+65
| * | | | | | | | | | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditionalkumavis2018-07-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update Chinese namingKevin Serrano2018-07-241-2/+2
| * | | | | | | | | | | | | Merge pull request #4802 from 03-26/developkumavis2018-07-271-4/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-212-6/+13
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-2116-46/+725
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update03-262018-07-151-4/+29
| * | | | | | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'develop' into no-inject-ani-gamerKevin Serrano2018-07-2517-47/+729
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Do not inject on ani.gamer.com.twDan Finlay2018-07-191-0/+1
| * | | | | | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-251-0/+3
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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-2138-30/+1103
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'develop' into transaction-notificationsCsaba S2018-07-2110-5/+598
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-212-1/+134
| | | * | | | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-209-4/+464
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | last css fixesbrunobar792018-07-191-0/+3
| | | | * | | | | | | | | | | design donebrunobar792018-07-194-4/+207
| | | | * | | | | | | | | | | fix browser not supported screenbrunobar792018-07-181-1/+1
| | | | * | | | | | | | | | | added some e2e testsbrunobar792018-07-181-1/+1
| | | | * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-181-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | updated account list based on new designsbrunobar792018-07-181-0/+6
| | | | * | | | | | | | | | | | 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 initial...brunobar792018-07-143-13/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | update labelbrunobar792018-07-141-1/+1
| | | | * | | | | | | | | | | | added affiliate link to trezorbrunobar792018-07-141-0/+3
| | | | * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-137-1/+118
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | added tooltipbrunobar792018-07-121-1/+1
| | | | * | | | | | | | | | | | | forget device and autiload account features addedbrunobar792018-07-122-1/+39
| | | | * | | | | | | | | | | | | update to temp dependenciesbrunobar792018-07-121-1/+6
| | | | * | | | | | | | | | | | | account removal is workingbrunobar792018-07-112-1/+39
| | | | * | | | | | | | | | | | | finish warning modal UIbrunobar792018-07-111-0/+9
| | | | * | | | | | | | | | | | | added ui to remove accountsbrunobar792018-07-101-0/+3
| | | | * | | | | | | | | | | | | 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
| | | | * | | | | | | | | | | | | copy updatedbrunobar792018-07-071-1/+1
| | | | * | | | | | | | | | | | | update connect harwdware screenbrunobar792018-07-071-0/+9
| | | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-0720-2/+412
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | UI refactorbrunobar792018-07-061-2/+4
| | | | * | | | | | | | | | | | | | move strings to localization filebrunobar792018-07-061-0/+9
| | | | * | | | | | | | | | | | | | lint fixbrunobar792018-07-041-2/+2
| | | | * | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-041-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0426-50/+50
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | move hardcoded strings to localization filebrunobar792018-07-031-0/+15
| | | | * | | | | | | | | | | | | | | allow to open specific route in fullscreen modebrunobar792018-07-031-2/+5
| | | | * | | | | | | | | | | | | | | fix environment detection regexbrunobar792018-07-031-1/+1
| | | | * | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0214-60/+172
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:31:24 +0800