aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* code review changesbrunobar792018-08-083-0/+43
|
* fix merge conflictsbrunobar792018-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
| | | |
* | | | 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 #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
| | |
* | | Merge pull request #4893 from kelvintyb/developThomas Huang2018-07-284-3/+65
|\ \ \ | |/ / |/| | Move phishing warning to the extension
| * | 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 naming on our language list
| * | | Update Chinese namingKevin Serrano2018-07-241-2/+2
| | | | | | | | | | | | I sincerely hope this is a non-controversial change.
* | | | Merge pull request #4802 from 03-26/developkumavis2018-07-271-4/+29
|\ \ \ \ | |_|/ / |/| | | Update translation 🇯🇵
| * | | 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 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-2517-47/+729
| |\ \ \ \ \
| * | | | | | 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-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-209-4/+464
| | |\ \ \ | | | | | | | | | | | | Initial trezor support
| | | * | | 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 ↵brunobar792018-07-181-0/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * | | | 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 ↵brunobar792018-07-143-13/+7
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | initial-trezor-support
| | | * | | | 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 ↵brunobar792018-07-137-1/+118
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * | | | | 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 ↵brunobar792018-07-0720-2/+412
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * | | | | | 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
| | | | | | | | | | | | |
| | | * | | | | | | | | | 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-105-1/+1475
| | | | | | | | | | | | |
| * | | | | | | | | | | | remove dropped handlerCsaba Solya2018-07-212-11/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | add notificationsCsaba Solya2018-07-204-30/+71
| | | | | | | | | | | | |
| * | | | | | | | | | | | initial testCsaba Solya2018-07-203-1/+32
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4656 from MetaMask/portal-metamask-ens-testDan Finlay2018-07-204-37/+47
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for .test ENS domains
| | * | | | | | | | | | | 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-193-3/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentryJenny Pollack2018-07-192-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | sentry - add detection for Brave Browser
| | * | | | | | | | | | | remove local testsJenny Pollack2018-07-192-3/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | sentry - add detection for Brave BrowserJenny Pollack2018-07-192-4/+11
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #4813 from MetaMask/no-inject-blueskybookingDan Finlay2018-07-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | Do not inject on blueskybooking.com
| | * | | | | | | | | | Do not inject on blueskybooking.comDan Finlay2018-07-171-0/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Per zendesk 2312.
| * | | | | | | | | | Use Number constructor for number conversion. Use existing ↵Alexander Tseung2018-07-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message
| * | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵Alexander Tseung2018-07-181-0/+9
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates
| * | | | | | | | | Fix edge cases and add translation compatibilitySara Reynolds2018-07-171-0/+3
| |/ / / / / / / /
| * | | | | | | | Add harbourair.com to injection block listDan Finlay2018-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This site was getting unexpected results when MetaMask was installed. https://consensys.zendesk.com/agent/tickets/2312
| * | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function
| | * \ \ \ \ \ \ \ Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-1146-59/+471
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
| | | | | | | | | |
| * | | | | | | | | Add tooltip to new tab icon in tx-viewWhymarrh Whitby2018-07-121-0/+3
| | | | | | | | | |
| * | | | | | | | | Add tooltip to menu icon in tx-viewWhymarrh Whitby2018-07-121-0/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-125-1/+77
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction views
| | * | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-071-10/+12
| | | | | | | | | |
| | * | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-072-1/+4
| | | | | | | | | |
| | * | | | | | | | Display newest transactionAlexander Tseung2018-07-071-1/+1
| | | | | | | | | |
| | * | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-076-13/+84
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-07-1146-59/+471
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into i#3896
| | * | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-061-0/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update import from seed screen on new ui.
| | | * | | | | | | Update import from seed screen on new ui.Dan2018-07-051-0/+9
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | 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.
| | | * | | | | | | 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-0441-141/+522
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Conditionally use Promise-based extension API when creating windowsbitpshr2018-07-041-4/+4
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Update to support pathnames on IPFS hashPhyrexTsai2018-06-291-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url. You can try the example below: http://phyrextsai.eth/index.html http://phyrextsai.eth/images/phyrex.jpg
| | * | | | | | Update 404.htmlPhyrexTsai2018-06-021-1/+2
| | | | | | | |
| | * | | | | | Merge branch 'develop' into portal-metamaskPhyrexTsai2018-06-019-43/+118
| | |\ \ \ \ \ \
| | * | | | | | | Update 404Yung chieh Tsai2018-06-011-1/+0
| | | | | | | | |
| | * | | | | | | Update ipfs to infuraYung chieh Tsai2018-06-011-2/+2
| | | | | | | | |
| | * | | | | | | Update manifest.jsonYung chieh Tsai2018-06-011-4/+3
| | | | | | | | |
| | * | | | | | | Update default providerYung chieh Tsai2018-05-301-1/+1
| | | | | | | | |
| | * | | | | | | Update libYung chieh Tsai2018-05-293-23/+71
| | | | | | | | |
| | * | | | | | | Rename filesYung chieh Tsai2018-05-299-122/+119
| | | | | | | | |
| | * | | | | | | Update manifest.jsonYung chieh Tsai2018-05-291-4/+0
| | | | | | | | |
| | * | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-292-1/+5
| | | | | | | | |
| | * | | | | | | setTimeout bug fixMikeCheng12082018-05-291-2/+5
| | | | | | | | |
| | * | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-2918-5/+356
| | | | | | | | |
| * | | | | | | | 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-0428-53/+55
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | eslint --fix .brunobar792018-07-0327-53/+52
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-281-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | [new-ui] Improve ENS input errors and update ens validation on network change
| | * | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2015-99/+167
| | |\ \ \ \ \
| | * | | | | | ENS input in send form shows distinct errors for invalid addresses and ↵Dan2018-06-151-0/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | non-existent addresses.
* | | | | | | 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 an id to the metamask notification popup
| * | | | | set the popup id returned by create promisevittominacori2018-06-181-3/+4
| | | | | |
| * | | | | set an id to the metamask notification popupvittominacori2018-06-171-1/+2
| | | | | |
* | | | | | Merge branch 'develop' into v4.8.0Thomas2018-06-197-18/+97
|\ \ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add apparent phishing address to block list
| | * | | | | | 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
| | |/ / / / / | | | | | | | | | | | | | | In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
| * | | | | | View address of an added token (#4591)Csaba S2018-06-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding menu actions for tokens * apply common style
| * | | | | | Re-enable dapp reload on network changeDan Finlay2018-06-152-0/+67
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform. Makes it easy to re-implement the change.
* / / / / / v4.8.0Thomas2018-06-151-1/+1
|/ / / / /
* | | | | 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 disable
| | * | | | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-152-25/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Push new notice on recent phishing incidents
| | * | | | | 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 ↵kumavis2018-06-1418-158/+304
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ValidateEmptyKey
| | * | | | | background - persistence pipeline - fix persistence bugkumavis2018-06-142-6/+32
| | |/ / / /
| | * | | | Merge branch 'develop' into stop-reload-on-network-changeErik Marks2018-06-136-46/+78
| | |\ \ \ \
| | | * | | | 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 ↵kumavis2018-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | to buffer
| * | | | | Make account import tests much more specificDan Finlay2018-06-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid.
| * | | | | Add validation for importing empty private keyDan Finlay2018-06-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously importing an empty string would result in a new empty Keyring object to be constructed, with no notification to the user. Now we render a clear error explaining the mistake.
* | | | | | Handle brave throwsDan Finlay2018-06-151-3/+11
| | | | | |
* | | | | | Merge branch 'develop' into save-braveJenny Pollack2018-06-0810-10/+118
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-082-6/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix bug where reset account would not work.
| | * | | | | Fix bug where reset account would not work.Dan Finlay2018-06-072-6/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.
| * | | | | 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 injection
| | | * | | | Block gravityforms.com from web3 injectionDan Finlay2018-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Fixes #3073
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-079-42/+175
| |\| | | | |
| | * | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-073-1/+43
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Disallow sending to ganache default accounts on main net
| | | * | | | | 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
| | | | | | | |
| | * | | | | | Merge pull request #4514 from whymarrh/account-label-type-checkkumavis2018-06-071-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel
| | | * | | | | | Add account type assertion to PreferencesController#setAccountLabelWhymarrh Whitby2018-06-061-0/+1
| | | | | | | | |
| | * | | | | | | i18n - ja improvements03-262018-06-071-2/+41
| | | | | | | | |
| | * | | | | | | 4.7.4v4.7.4kumavis2018-06-061-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4kumavis2018-06-061-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | 4.7.3kumavis2018-06-051-1/+1
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-058-8/+158
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-019-41/+117
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation
| | * \ \ \ \ \ \ Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-019-41/+117
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| * | / | | | | | Auto update gas estimate when to changes.Dan2018-05-311-0/+14
| |/ / / / / / /
| * | | | | | / Display correct titles and subtitles on send token and editing send ↵Dan2018-05-251-0/+7
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | transaction screens.
* | | | | | | 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
| | | | | |
* | | | | | lint - fix diagnostics reporterkumavis2018-06-061-1/+1
| | | | | |
* | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-064-66/+84
| | | | | |
* | | | | | add multivault detection to diagnostics reportingkumavis2018-06-061-0/+33
| |_|/ / / |/| | | |
* | | | | Record identity before deleting itDan Finlay2018-06-051-1/+1
| | | | |
* | | | | Mock notifier in testDan Finlay2018-06-051-1/+2
| | | | |
* | | | | Add commentDan Finlay2018-06-051-0/+2
| | | | |
* | | | | Do not alert to userDan Finlay2018-06-051-5/+0
| | | | |
* | | | | LintedDan Finlay2018-06-052-1/+2
| | | | |
* | | | | Add bug info under metadata keyDan Finlay2018-06-051-1/+7
| | | | |
* | | | | Add first time info to bug reportDan Finlay2018-06-052-1/+5
| | | | |
* | | | | Add version to reportDan Finlay2018-06-052-4/+6
| | | | |
* | | | | Fine tune error postingDan Finlay2018-06-052-6/+2
| | | | |
* | | | | Only notify first time lost ids are detectedDan Finlay2018-06-051-2/+8
| | | | |
* | | | | Add reporting uriDan Finlay2018-06-051-1/+1
| | | | |
* | | | | Begin adding unconfigured notifierDan Finlay2018-06-052-13/+21
| | | | |
* | | | | Persist lost identities to storage for later analysisDan Finlay2018-06-052-2/+33
| | | | |
* | | | | Add minimal user notification of issue.Dan Finlay2018-06-051-1/+1
| | | | |
* | | | | Add identity synchronizing codeDan Finlay2018-06-052-1/+48
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user.
* | | | 4.7.2kumavis2018-06-041-1/+1
| | | |
* | | | metamask-controller - clear account labels on restore from seed phrasekumavis2018-06-041-0/+4
| | | |
* | | | preferences controller - jsdoc fixkumavis2018-06-041-2/+2
| | | |
* | | | metamask - update preferences controller identities on keyring controller updatekumavis2018-06-042-3/+30
| | | |
* | | | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fixkumavis2018-06-041-1/+1
|\ \ \ \ | | | | | | | | | | sentry - message rewrite - guard against missing message
| * | | | sentry - message rewrite - guard against missing messagekumavis2018-05-311-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #4425 from MetaMask/masterkumavis2018-06-022-2/+21
|\ \ \ \ | | | | | | | | | | Merge Master into Develop