aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-081-0/+5
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecationDan Finlay2018-07-281-0/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add deprecation message for eth_signTypedDatabitpshr2018-07-281-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
|\| | | | | | | | | | |
| * | | | | | | | | | | 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 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-2511-45/+442
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Do not inject on ani.gamer.com.twDan Finlay2018-07-191-0/+1
* | | | | | | | | | | | | 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
|/ / / / / / / / / / / /
* | / / / / / / / / / / 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-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
| | * | | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-204-3/+180
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | 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 initial...brunobar792018-07-142-13/+1
| | | |\| | | | | | | | |
| | | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-133-1/+43
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | 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 initial...brunobar792018-07-076-0/+120
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | initial trezor supportBruno2018-06-103-1/+1455
| * | | | | | | | | | | | | | | | remove dropped handlerCsaba Solya2018-07-212-11/+1
| * | | | | | | | | | | | | | | | add notificationsCsaba Solya2018-07-204-30/+71
| * | | | | | | | | | | | | | | | initial testCsaba Solya2018-07-202-0/+30
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #4656 from MetaMask/portal-metamask-ens-testDan Finlay2018-07-203-36/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update variable namebitpshr2018-07-191-2/+2
| | * | | | | | | | | | | | | | | Updates for lintingbitpshr2018-07-191-1/+1
| | * | | | | | | | | | | | | | | Updatesbitpshr2018-07-191-33/+37
| | * | | | | | | | | | | | | | | Add support for .test Ropsten ENS domainsbitpshr2018-07-192-2/+7
| * | | | | | | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentryJenny Pollack2018-07-192-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | remove local testsJenny Pollack2018-07-192-3/+0
| | * | | | | | | | | | | | | | | sentry - add detection for Brave BrowserJenny Pollack2018-07-192-4/+11
| | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| * / | | | | | | | | | | | | | Do not inject on blueskybooking.comDan Finlay2018-07-171-0/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Add harbourair.com to injection block listDan Finlay2018-07-131-0/+1
| * | | | | | | | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-1132-57/+176
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-071-10/+12
| | * | | | | | | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-071-1/+1
| | * | | | | | | | | | | | | Display newest transactionAlexander Tseung2018-07-071-1/+1
| | * | | | | | | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-072-13/+12
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-1132-57/+176
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Use background gas price estimation method in new ui.Dan2018-06-291-0/+1
| | | |/ / / / / / / / / / /
| | * | | | | | | | | | | | fix lint errorsbrunobar792018-07-044-8/+7
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into HEADbrunobar792018-07-0438-137/+461
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Conditionally use Promise-based extension API when creating windowsbitpshr2018-07-041-4/+4
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Update to support pathnames on IPFS hashPhyrexTsai2018-06-291-4/+8
| | * | | | | | | | | | | Merge branch 'develop' into portal-metamaskPhyrexTsai2018-06-016-35/+78
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update ipfs to infuraYung chieh Tsai2018-06-011-2/+2
| | * | | | | | | | | | | | Update default providerYung chieh Tsai2018-05-301-1/+1
| | * | | | | | | | | | | | Update libYung chieh Tsai2018-05-292-22/+46
| | * | | | | | | | | | | | Rename filesYung chieh Tsai2018-05-294-60/+57
| | * | | | | | | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-291-1/+1
| | * | | | | | | | | | | | setTimeout bug fixMikeCheng12082018-05-291-2/+5
| | * | | | | | | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-295-0/+92
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+6
| * | | | | | | | | | | | migration 27 - remove rejected transactions from statefrankiebee2018-06-261-0/+35
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | fix detection on submit passwordEsteban MIno2018-07-212-8/+10
* | | | | | | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-202-19/+25
* | | | | | | | | | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-13/+39
* | | | | | | | | | | | detect tokens through infuraEsteban MIno2018-07-132-22/+25
* | | | | | | | | | | | improve testsEsteban MIno2018-07-122-17/+14
* | | | | | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-0427-53/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | eslint --fix .brunobar792018-07-0327-53/+52
| |/ / / / / / / / / /
* | | | | | | | | | | passtest-lintEsteban MIno2018-07-041-6/+0
* | | | | | | | | | | tests for specEsteban MIno2018-06-281-1/+1
* | | | | | | | | | | network store to detect tokenEsteban MIno2018-06-282-9/+11
* | | | | | | | | | | detect tokens pollingEsteban MIno2018-06-282-0/+105
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553Thomas Huang2018-06-211-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | set the popup id returned by create promisevittominacori2018-06-181-3/+4
| * | | | | | | | | | set an id to the metamask notification popupvittominacori2018-06-171-1/+2
* | | | | | | | | | | notice controller - properly show new notices for non-new userskumavis2018-06-191-3/+6
* | | | | | | | | | | Merge pull request #4586 from MetaMask/block-idex-phisherkumavis2018-06-193-15/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
| * | | | | | | | | | | blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
| * | | | | | | | | | | Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
| * | | | | | | | | | | Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
| |/ / / / / / / / / /
* / / / / / / / / / / Re-enable dapp reload on network changeDan Finlay2018-06-152-0/+67
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'develop' into save-bravekumavis2018-06-1510-144/+119
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #4571 from MetaMask/disable-diagnosticsDan Finlay2018-06-151-8/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-152-25/+10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | notice-controller - update memStore on bootkumavis2018-06-141-0/+1
| | * | | | | | | | | | test - e2e - check for phishing warningkumavis2018-06-141-1/+1
| | * | | | | | | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-142-24/+8
| | * | | | | | | | | | notices - notices collection is now manually editedkumavis2018-06-141-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-1415-155/+255
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | background - persistence pipeline - fix persistence bugkumavis2018-06-142-6/+32
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'develop' into stop-reload-on-network-changeErik Marks2018-06-135-46/+71
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
| | | * | | | | | | | | metamask - ensure all nonce locks are releasedkumavis2018-06-134-17/+18
| | | * | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | removed auto-reload.js, moved global web3 export to inpage.jsErik Marks2018-06-132-43/+16
| | * | | | | | | | | wipErik Marks2018-06-132-41/+22
| * | | | | | | | | | account-import-strategies - ensure privateKey is prefixed before converting t...kumavis2018-06-141-2/+3
| * | | | | | | | | | Make account import tests much more specificDan Finlay2018-06-121-0/+7
| * | | | | | | | | | Add validation for importing empty private keyDan Finlay2018-06-061-0/+3
* | | | | | | | | | | Handle brave throwsDan Finlay2018-06-151-3/+11
* | | | | | | | | | | Merge branch 'develop' into save-braveJenny Pollack2018-06-087-7/+69
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-082-6/+10
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Fix bug where reset account would not work.Dan Finlay2018-06-072-6/+10
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-071-0/+1
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #4477 from MetaMask/i3073-block-gravityformskumavis2018-06-071-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Block gravityforms.com from web3 injectionDan Finlay2018-06-041-0/+1
| * | | | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-077-39/+133
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-073-1/+43
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-313-18/+20
| | | * | | | | | | | fix documentationCsaba Solya2018-05-301-1/+1
| | | * | | | | | | | adding tests for recipient blacklist checkerCsaba Solya2018-05-302-5/+5
| | | * | | | | | | | adding transaction controller testsCsaba Solya2018-05-301-1/+1
| | | * | | | | | | | initial implementationCsaba Solya2018-05-302-1/+41
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Add account type assertion to PreferencesController#setAccountLabelWhymarrh Whitby2018-06-061-0/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-057-6/+154
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-016-35/+78
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Auto update gas estimate when to changes.Dan2018-05-311-0/+14
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | lintJenny Pollack2018-06-071-1/+1
* | | | | | | | remove loglevelJenny Pollack2018-06-071-2/+1
* | | | | | | | preferred first languauge - check for BraveJenny Pollack2018-06-071-8/+5
* | | | | | | | first language - add check for brave browser on getAcceptLanguagesJenny Pollack2018-06-071-1/+11
| |_|_|/ / / / |/| | | | | |
* | | | | | | diagnostics - fix reportMultipleKeyrings callkumavis2018-06-061-1/+1
* | | | | | | diagnostics - minor fixeskumavis2018-06-062-5/+5
generated by cgit (git 2.34.1) at 2024-10-15 04:21:58 +0800