aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2015-99/+167
|\
| * 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
| | |\
| | | * 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
| | * | View address of an added token (#4591)Csaba S2018-06-191-0/+6
| | * | Re-enable dapp reload on network changeDan Finlay2018-06-152-0/+67
| | |/
| * / 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 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-1418-158/+304
| | |\ \
| | | * | 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 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-0810-10/+118
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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
* | | | | ENS input in send form shows distinct errors for invalid addresses and non-ex...Dan2018-06-151-0/+3
| |/ / / |/| | |
* | | | 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-079-42/+175
|\| | | |
| * | | | 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
| * | | | | Merge pull request #4514 from whymarrh/account-label-type-checkkumavis2018-06-071-0/+1
| |\ \ \ \ \
| | * | | | | 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
| | | |_|/ | | |/| |
| * | | | 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
| |/ / /
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-058-8/+158
|\| | |
| * | | 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
| | |/ | |/|
| * | 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 messagekumavis2018-05-311-1/+1
| | |/
| * | Merge pull request #4425 from MetaMask/masterkumavis2018-06-022-2/+21
| |\ \
| | * | Version 4.7.1v4.7.1Dan Finlay2018-06-022-1/+18
| | * | Merge branch 'master' into developDan Finlay2018-06-021-2/+4
| | |\ \
| | | * | 4.7.0v4.7.0kumavis2018-05-311-2/+4
| | | |/
| * | / Fix return value of migration 26 when missing KC or PCWhymarrh Whitby2018-06-021-1/+1
| |/ /
| * | Properly end the middleware stack on RPC errorbitpshr2018-06-021-0/+1
* | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-019-41/+117
|\ \ \
| * | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-019-41/+117
| |\| |
| | * | Add new alert modalsAlexander Tseung2018-06-011-1/+10
| | |/
| | * Add rpc key to i18n messages (#4375)Alexander Tseung2018-05-301-0/+3
| | * Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma...kumavis2018-05-306-23/+64
| | |\
| | | * cleanErrorStack moved to separate library moduleAnton2018-05-293-19/+36
| | | * error message fixAnton2018-05-291-2/+1
| | | * Clean up user rejection error messageAnton2018-05-281-3/+14
| | | * Merge pull request #3997 from jakubsta/masterkumavis2018-05-222-5/+12
| | | |\
| | | | * Update: allow other extension to connectJakub Stasiak2018-04-182-5/+12
| | | * | Merge pull request #4140 from MetaMask/v4.6.1Thomas Huang2018-05-019-59/+143
| | | |\ \
| | | | * | Version 4.6.1kumavis2018-05-011-1/+1
| | | * | | require logfrankiebee2018-05-011-0/+1
| | | * | | log emitter errorsfrankiebee2018-04-301-6/+10
| | | * | | transactions - run event emitters outside context of _setTxStatusfrankiebee2018-04-301-7/+9
| | * | | | Merge pull request #4390 from MetaMask/i18n-brave-fixkumavis2018-05-301-4/+7
| | |\ \ \ \
| | | * | | | i18n - getFirstPreferredLangCode - guard against missing i18n apikumavis2018-05-291-4/+7
| | * | | | | Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-302-3/+23
| | * | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | * | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| | |/ / / /
* | / / / / Auto update gas estimate when to changes.Dan2018-05-311-0/+14
|/ / / / /
* / / / / Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-251-0/+7
|/ / / /
* | | | Merge pull request #4337 from MetaMask/recent-blocks-parallelFrankie2018-05-231-15/+7
|\ \ \ \
| * | | | controllers - recent-blocks - pull first historical blocks in parallelkumavis2018-05-221-15/+7
* | | | | Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-233-1/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update designs for Add Token screenAlexander Tseung2018-05-203-1/+39
* | | | | Reveal get filtered tx list (#4332)Frankie2018-05-222-16/+1
* | | | | Merge branch 'develop' into ci-publish-releasekumavis2018-05-228-34/+167
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into...kumavis2018-05-221-1/+2
| |\ \ \ \ \
| | * | | | | Added trailing comma for eslintsimon2018-05-181-1/+1
| | * | | | | Added adyen.com to blacklisted domains because postMessages are blocking car...simon2018-05-181-1/+2
| * | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-225-33/+97
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-181-1/+8
| | * | | | | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-172-0/+41
| | * | | | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-172-8/+22
| | * | | | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-172-22/+8
| | * | | | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-3/+19
| | |/ / / /
| * | | | | Merge pull request #4199 from MetaMask/i3487-provider-errorsDan Finlay2018-05-192-0/+68
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add new json-rpc-engine middleware for improved error handlingbitpshr2018-05-142-0/+68
* | | | | | docs - jsdoc - fix syntaxkumavis2018-05-191-1/+1
|/ / / / /
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-178-194/+437
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4146 from MetaMask/sentry-error-like2kumavis2018-05-171-17/+25
| |\ \ \ \ \
| | * | | | | sentry - add helper to fully rewrite all error messageskumavis2018-05-011-17/+25
| | | |_|/ / | | |/| | |
| * | | | | network - remove debugging console.logkumavis2018-05-171-1/+0
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-177-32/+391
| |\ \ \ \ \
| | * | | | | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-141-1/+1
| | | |/ / / | | |/| | |
| | * | | | Add new unlock screen designAlexander Tseung2018-05-121-1/+10
| | * | | | Chinese translation Enhancements (#4218)Orange2018-05-121-25/+358
| * | | | | lint - cleanup some unused variableskumavis2018-05-031-1/+0
| * | | | | controllers - network - move default config out of first-time-statekumavis2018-05-032-11/+15
| * | | | | network - refactor to remove unnecesary codekumavis2018-05-013-124/+29
| * | | | | network - remove setNetworkEndpointskumavis2018-05-012-14/+0
| * | | | | controllers - network - more semantic assertkumavis2018-05-011-1/+1
| | |/ / / | |/| | |
* | | | | tx-state-history-helper - use more readable Date.now methodkumavis2018-05-171-1/+1
* | | | | fix lint issuesCsaba Solya2018-05-102-2/+2
* | | | | remove unnecessary libCsaba Solya2018-05-101-1/+0
* | | | | revert unnecessary change in state managerCsaba Solya2018-05-101-13/+7
* | | | | add time stamps to transaction history log entriesCsaba Solya2018-05-102-16/+28
| |/ / / |/| | |
* | | | Fix documentation typobitpshr2018-05-081-1/+1
* | | | Fix Slovenian translation (#4189)Filip Š2018-05-081-4/+4
* | | | transactions - add a nonce check utility for ui usefrankiebee2018-05-022-0/+16
* | | | fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
* | | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframekumavis2018-05-011-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Blacklist problematic shopify iFrameBryce Neal2018-05-011-0/+1
* | | | sentry - report error-like messages using the obj messagekumavis2018-05-011-0/+10
* | | | sentry - wrap report modifiers in a try-catchkumavis2018-05-011-16/+24
* | | | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-016-41/+103
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-2311-79/+295
| |\ \ \
| * | | | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-234-18/+102
| * | | | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-222-23/+1
* | | | | Merge pull request #4132 from MetaMask/masterkumavis2018-04-302-18/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | guard adainst raven erroringfrankiebee2018-04-302-18/+25
* | | | | Merge pull request #4110 from MetaMask/masterkumavis2018-04-2810-222/+696
|\| | | |
| * | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0Thomas Huang2018-04-273-3/+3
| |\ \ \ \
| | * | | | v4.6.0kumavis2018-04-271-1/+1
| * | | | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-269-221/+695
| |\ \ \ \ \
| | * | | | | transactions - more docs and clean upsfrankiebee2018-04-266-55/+116
| | * | | | | Cleaned up some typos and JSDocs in TransactionsDan Finlay2018-04-243-38/+40
| | * | | | | transactions - fix referncesfrankiebee2018-04-202-1/+2
| | * | | | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-2042-234/+3695
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | meta - transactions - docs yo!frankiebee2018-04-208-73/+351
| | * | | | | fix up - more docsfrankiebee2018-04-143-38/+77
| | * | | | | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-41/+109
| | * | | | | transactions - code cleanupfrankiebee2018-04-132-58/+59
| | * | | | | transactions - lint fixesfrankiebee2018-04-113-12/+12
| | * | | | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-118-69/+93
* | | | | | | Return 0 for token rate fetch failuresbitpshr2018-04-271-1/+5
| |_|_|/ / / |/| | | | |
* | | | | | rpc - bump provider-engine + eth-json-rpc-filterskumavis2018-04-261-1/+1
* | | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use latest balanc3 api for pricesDan Finlay2018-04-251-1/+1
* | | | | | lint fixDan2018-04-241-0/+1
* | | | | | Merge branch 'master' into dm-docs-2Dan2018-04-2418-280/+867
|\| | | | |
| * | | | | Use the metamask balanc3 dev price apiDan Finlay2018-04-241-1/+1
| * | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskControllerDan Finlay2018-04-241-131/+330
| |\ \ \ \ \
| | * | | | | Linted docsDan Finlay2018-04-241-1/+1
| | * | | | | Linted jsdocsDan Finlay2018-04-211-52/+60
| | * | | | | Added docs to MM-controllerDan Finlay2018-04-191-130/+321
| * | | | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-247-104/+151
| |\ \ \ \ \ \
| | * | | | | | Clean up network configAlexander Tseung2018-04-247-104/+151
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4041 from MetaMask/DocumentBackgroundDan Finlay2018-04-241-2/+127
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove wrong charsDan Finlay2018-04-211-2/+2
| | * | | | | Add ui note to background docsDan Finlay2018-04-211-1/+1
| | * | | | | Lint background docsDan Finlay2018-04-211-12/+12
| | * | | | | Document MetaMaskState and TransactionMetaDan Finlay2018-04-211-0/+69
| | * | | | | Document Background ScriptDan Finlay2018-04-201-2/+58
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-2111-79/+295
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Clean up JSDoc for background scriptsbitpshr2018-04-207-24/+32
| | * | | | Add more documentation to computed balances controllerbitpshr2018-04-204-6/+77
| | * | | | Add JSDoc to various background scriptsbitpshr2018-04-193-11/+13
| | * | | | Add generated docsbitpshr2018-04-193-6/+6
| | * | | | Add JSDoc to various background scriptsbitpshr2018-04-196-70/+205
* | | | | | Remove accidentally added code in message-manager.Dan2018-04-241-8/+0
* | | | | | Remove unnecessary doc comment.Dan2018-04-241-2/+0
* | | | | | Fix nits.Dan2018-04-244-33/+33
* | | | | | Minor fixes in a number of docs.Dan2018-04-216-18/+17
* | | | | | Notification manager method docs.Dan2018-04-211-4/+31
* | | | | | Merge branch 'master' into dm-docs-2Dan2018-04-2035-339/+2435
|\| | | | |
| * | | | | Merge pull request #3984 from whymarrh/3941-jsdocDan Finlay2018-04-199-48/+150
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a few missing docblocks to background filesWhymarrh Whitby2018-04-199-48/+150
| * | | | | Merge pull request #3987 from MetaMask/dm-docs-1Dan Finlay2018-04-198-17/+389
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Missing bracket in docblock.Dan2018-04-191-1/+1
| | * | | | Merge branch 'master' into dm-docs-1Dan2018-04-1926-155/+2124
| | |\| | |
| | * | | | NO MIXED TABS AND SPACESDan2018-04-193-137/+137
| | * | | | Documentation fix: @constant -> @propertyDan2018-04-191-1/+1
| * | | | | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-191-0/+3
| |\ \ \ \ \
| | * | | | | Fix spinner layoutAlexander Tseung2018-04-181-2/+2
| | * | | | | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-0/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-192-1/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-192-1/+23
| | |/ / /
| * / / / I18n - add Tamil + some Hindi fixesVikas Kumar Yadav2018-04-193-10/+923
| |/ / /
| * | | Fix confirmation popup not always openingAlexander Tseung2018-04-176-53/+83
| * | | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1718-9/+930
| |\ \ \
| | * \ \ Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1716-9/+17
| | |\ \ \
| | | * | | Require loglevel singleton in each module that uses itbitpshr2018-04-1416-9/+17
| | * | | | Fix vault translationMartin Šmíd2018-04-141-4/+4
| | * | | | Add czech translationMartin Šmíd2018-04-142-0/+913
| | |/ / /
| * | | | Disable token price polling when no client is activebitpshr2018-04-173-0/+13
| * | | | Maintain token prices using a background servicebitpshr2018-04-162-0/+83
| |/ / /
| * | | Add tests for ComposableObservableStorebitpshr2018-04-141-11/+11
| * | | Add ComposableObservableStore for subscription managementbitpshr2018-04-132-70/+85
* | | | Even more documentation for various controllers and libs.Dan2018-04-1913-49/+742
| |/ / |/| |
* | | Add missing descriptions in util.jsDan2018-04-171-4/+4
* | | Document async function as returning a promise.Dan2018-04-171-1/+1
* | | Improve documentation of promises that return undefined.Dan2018-04-172-4/+4
* | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-176-7/+8
* | | Spell deprecated correctly.Dan2018-04-171-2/+2
* | | @params -> @param fixDan2018-04-173-8/+8
* | | Documentation for various controllers and libsDan2018-04-179-19/+387
* | | Documentation for environemnt-type.jsDan2018-04-121-0/+9
|/ /
* | Merge pull request #3938 from nyatla/masterkumavis2018-04-101-27/+72
|\ \
| * \ Merge tag 'v4.5.5'nyatla2018-04-1052-561/+1145
| |\ \
| * | | Update messages.jsonR.IIzuka2018-04-101-30/+99
* | | | Translate to Turkish (#3876)Mert Ozdag2018-04-102-0/+913
* | | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-101-1/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0610-36/+198
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-057-39/+111
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-0412-42/+47
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-031-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0311-184/+275
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-03-312-3/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fix merge conflictsAlexander Tseung2018-03-319-48/+62
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Fix i18n merge conflictsAlexander Tseung2018-03-3020-173/+404
| |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:37:54 +0800