aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-303-35/+49
|\
| * i18n - Update German LocaleNico2018-03-301-24/+39
| * changed zaad -> back-up woordenFBrinkkemper2018-03-291-8/+8
| * Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-291-3/+2
| |\
| | * Rename variable to be more understandableDan Finlay2018-03-291-3/+2
* | | build - extension - move js files to toplevelkumavis2018-03-295-11/+11
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-294-12/+30
|\| |
| * | Merge pull request #3777 from MetaMask/etc-fixesFrankie2018-03-291-1/+1
| |\ \
| | * | controllers - currency - warn currency and encountered errorkumavis2018-03-291-1/+1
| * | | Merge pull request #3765 from MetaMask/sentry-error-simplifyFrankie2018-03-291-2/+12
| |\ \ \
| | * | | sentry - simplify error message 'Transaction Failed: known transaction'kumavis2018-03-281-2/+12
| | |/ /
| * / / tx controller - explode on non-hex txParams + dont add chainId to txParams + ...kumavis2018-03-282-9/+17
| |/ /
* | | build - rename 'popup.js' to 'ui.js'kumavis2018-03-294-3/+3
* | | ui - change window title 'MetaMask Plugin' to 'MetaMask'kumavis2018-03-292-2/+2
|/ /
* | Merge pull request #3752 from MetaMask/sentry-error-fixFrankie2018-03-283-25/+35
|\ \
| * | sentry - simplify all ethjs errors for better batchingkumavis2018-03-283-25/+35
* | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-281-34/+39
|\ \ \
| * | | metamask-controller - fix typokumavis2018-03-281-1/+1
| * | | Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-281-34/+39
| |/ /
* | | i18n - fix locales indekumavis2018-03-281-1/+1
* | | i18n - derrive locale codes from indexkumavis2018-03-281-3/+2
* | | i18n - add locales index jsonkumavis2018-03-281-0/+19
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-283-6/+52
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into i#3731frankiebee2018-03-284-28/+113
| |\|
| * | migration for removing unnecessary transactions from statefrankiebee2018-03-282-0/+52
| * | transactions - only save up to 40 txs totall across all networksfrankiebee2018-03-271-6/+1
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-282-25/+112
|\ \ \ | | |/ | |/|
| * | Merge pull request #3739 from gasolin/zhtwfixv4.4.0kumavis2018-03-281-11/+50
| |\ \
| | * | [zh-TW] fix translation and add missing stringsgasolin2018-03-271-11/+50
| * | | Update messages.jsonR.IIzuka2018-03-271-14/+62
* | | | Undo unnecessary line removals.Dan2018-03-272-0/+2
* | | | Remove comments and console.logsDan2018-03-271-2/+1
* | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-278-3/+2558
|\| | |
| * | | include migration 22frankiebee2018-03-271-0/+1
| |/ /
| * | v4.4.0kumavis2018-03-271-1/+1
| * | Fix bug where full localStorage would crash on startDan Finlay2018-03-271-2/+0
| |/
| * Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-271-0/+15
| |\
| | * Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-272-6/+29
| | |\
| | * | Updates Add token screen to latest design.Dan2018-03-241-0/+15
| * | | migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-271-0/+39
| * | | i18n - sl Slovenian translation (#3724)Filip Š2018-03-271-0/+819
| * | | i18n - zh_tw traditional chinese (taiwanese)gasolin2018-03-271-0/+864
| * | | Merge pull request #3711 from artiya4u/feature/thai_localekumavis2018-03-271-0/+819
| |\ \ \ | | |_|/ | |/| |
| | * | Update Thai translate.artiya4u2018-03-241-3/+3
| | * | Update Thai translate.artiya4u2018-03-241-2/+2
| | * | Update Thai translate.artiya4u2018-03-241-1/+1
| | * | ๊๊Update Thai translate.artiya4u2018-03-241-9/+9
| | * | First add Thai translate.artiya4u2018-03-231-0/+819
* | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-272-6/+29
|\| | |
| * | | lint - fixkumavis2018-03-241-1/+1
| * | | sentry - namespace files under metamask dirkumavis2018-03-241-2/+2
| * | | sentry - rewrite report urls + use raven-js from npmkumavis2018-03-242-7/+30
| | |/ | |/|
* | | Use extension api to get initial locale.Dan2018-03-224-6/+26
* | | Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
* | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2214-563/+4072
|\| |
| * | v4.3.0kumavis2018-03-221-1/+1
| * | Merge pull request #3656 from MetaMask/trigun0x2-master2kumavis2018-03-223-6/+15
| |\ \
| | * \ Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x...kumavis2018-03-221-0/+873
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into...kumavis2018-03-223-6/+15
| | |\ \ \
| | | * | | fix for lintJeffrey Tong2018-03-211-5/+5
| | | * | | remove console logJeffrey Tong2018-03-121-2/+0
| | | * | | add comments that need clarification on naming conventionJeffrey Tong2018-03-123-9/+10
| | | * | | fixed multiple notification windows when executing batchJeffrey Tong2018-03-082-2/+14
| | | * | | removed check for width & height on multiple popup windowsJeffrey Tong2018-03-081-3/+1
| * | | | | Merge pull request #3648 from raulk/patch-1kumavis2018-03-221-53/+53
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Minor adjustments to Spanish translationRaúl Kripalani2018-03-211-53/+53
| * | | | | i18n - fix german json formattingkumavis2018-03-221-7/+6
| * | | | | Tranlate to German (#3575)Nico2018-03-221-0/+874
| | |/ / / | |/| | |
| * | | | Translate to Russian (#3644)Victor Charapaev2018-03-221-0/+819
| * | | | hn _locales : message.json [HINDI] (#3611)N1X2018-03-221-0/+819
| |/ / /
| * | | Merge pull request #3625 from bradford-hamilton/masterkumavis2018-03-211-0/+819
| |\ \ \
| | * | | add Dutch translationsBradford Lamson-Scribner2018-03-211-0/+819
| | | |/ | | |/|
| * | | Merge pull request #3641 from hermanjunge/masterkumavis2018-03-211-10/+0
| |\ \ \
| | * | | Nuke the es_419 localeHerman Junge2018-03-211-10/+0
| | |/ /
| * | | Merge pull request #3585 from lazaridiscom/laz/i3568kumavis2018-03-211-245/+354
| |\ \ \
| | * | | moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| | * | | add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-161-3/+3
| | * | | group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| | * | | adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
| * | | | Merge pull request #3504 from lazaridiscom/laz/i3427kumavis2018-03-213-0/+23
| |\ \ \ \
| | * | | | add READMEs to folders, re #3427Lazaridis2018-03-143-0/+23
| * | | | | last pass (for now)Herman Junge2018-03-211-53/+53
| * | | | | all 286 english strings were found in your localeHerman Junge2018-03-211-0/+66
| * | | | | all 264 strings declared in your locale were found in the english oneHerman Junge2018-03-211-26/+8
| * | | | | alphabetic sort of spanish messages.jsonHerman Junge2018-03-211-237/+237
* | | | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-224-4/+4
* | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-217-39/+3224
|\| | | | |
| * | | | | Add i18n to tx statusThomas2018-03-211-1/+13
| * | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-216-36/+3146
| |\ \ \ \ \
| | * | | | | Add messages.json from @Grana69Grana692018-03-211-5/+835
| | * | | | | Merge pull request #3613 from alvesjtiago/masterkumavis2018-03-211-0/+819
| | |\ \ \ \ \
| | | * | | | | Portuguese translations.Tiago Alves2018-03-201-0/+819
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #3579 from matteopey/italian-translationkumavis2018-03-211-0/+819
| | |\ \ \ \ \
| | | * | | | | Update translation based on the new message.jsonmatteopey2018-03-201-1/+211
| | | * | | | | Clients because we mean Ethereum clientsmatteopey2018-03-161-1/+1
| | | * | | | | Fix as requested by reviewmatteopey2018-03-161-1/+1
| | | * | | | | Add italian translationmatteopey2018-03-161-0/+609
| | * | | | | | Merge pull request #3574 from marvinvista/masterkumavis2018-03-211-0/+609
| | |\ \ \ \ \ \
| | | * | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-1/+1
| | | * | | | | | Translate to Tagalog #3535Marvin Vista2018-03-151-0/+609
| | * | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-208-13/+2660
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-161-0/+32
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-152-4/+637
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| | * | | | | | | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
| | * | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-145-11/+680
| | |\ \ \ \ \ \ \
| | * | | | | | | | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
| | * | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o...frankiebee2018-03-141-0/+4
| | * | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-095-15/+98
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | fix marking of confirmed transaction as droppedfrankiebee2018-03-091-1/+1
| | * | | | | | | | transactions - make _markNonceDuplicatesDroppedfrankiebee2018-03-081-21/+20
| | * | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-0813-9/+766
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | refactor retrytx with higher gas price:frankiebee2018-03-082-26/+55
| * | | | | | | | | | Update onlySendToEtherAddress messageThomas2018-03-211-1/+1
| * | | | | | | | | | Add i18n in settings/infoThomas2018-03-211-0/+3
| * | | | | | | | | | Started on Tx list i18nThomas2018-03-211-0/+6
| * | | | | | | | | | Remove duplicate keysThomas2018-03-201-7/+1
| * | | | | | | | | | Add send screen templateDan Finlay2018-03-201-1/+13
| * | | | | | | | | | Add template for settings and infoDan Finlay2018-03-201-0/+9
| * | | | | | | | | | Add recover and backup tempaltesDan Finlay2018-03-201-0/+18
| * | | | | | | | | | Add connecting indication templatesDan Finlay2018-03-201-0/+15
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Lint fixes.Dan2018-03-201-1/+0
* | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-208-10/+2090
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #3555 from mamiM/mamiM-Ja-translationkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Translation to JapaneseMami Mordovets2018-03-141-3/+602
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3560 from Orangem21/masterkumavis2018-03-181-3/+602
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixOrange2018-03-151-2/+2
| | * | | | | | | | | Merge pull request #2 from MetaMask/masterOrange2018-03-154-5/+75
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixOrange2018-03-141-1/+1
| | * | | | | | | | | | yuanaichiyuanchao2018-03-141-102/+102
| | * | | | | | | | | | fixOrange2018-03-141-30/+30
| | * | | | | | | | | | fixOrange2018-03-141-1/+1
| | * | | | | | | | | | updateOrange2018-03-141-3/+602
| * | | | | | | | | | | Merge pull request #3602 from vietlq/masterkumavis2018-03-181-0/+609
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | spaceViet Le2018-03-181-1/+1
| | * | | | | | | | | | | corrected vn -> viViet Le2018-03-181-0/+0
| | * | | | | | | | | | | Translated to Vietnamese. Translator: Trang Ha, Editor: Viet LeViet Le2018-03-181-0/+609
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3564 from nujabes403/patch-1kumavis2018-03-181-5/+604
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-16/+16
| | * | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-2/+2
| | * | | | | | | | | | | Update messages.jsonnujabes4032018-03-161-1/+1
| | * | | | | | | | | | | Translated whole message in KRnujabes4032018-03-151-109/+109
| | * | | | | | | | | | | Update kr translation to messages.jsonnujabes4032018-03-151-5/+604
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3590 from SaptakS/feature/whitelistDan Finlay2018-03-171-1/+16
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Inject Script: Blacklist domains where not to inject scriptSaptak Sengupta2018-03-171-1/+16
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-171-0/+16
| * | | | | | | | | | | Fix messages typo (#3591)Thomas Huang2018-03-171-1/+1
| * | | | | | | | | | | More for i18nThomas2018-03-161-0/+210
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #3576 from Senshii/masterkumavis2018-03-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | fix plural in french translationsimon fourdinier2018-03-151-1/+1
| | |/ / / / / / / /
| * / / / / / / / / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-161-0/+32
| |/ / / / / / / /
* | | | | | | | | Fetch localeMessages in front end only.Dan2018-03-202-13/+3
* | | | | | | | | Handle i18n with redux.Dan2018-03-164-8/+25
* | | | | | | | | Translation to JapaneseMami Mordovets2018-03-151-3/+602
* | | | | | | | | i18n - load locales manuallykumavis2018-03-151-59/+74
|/ / / / / / / /
* | | | | | | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
|\ \ \ \ \ \ \ \
| * | | | | | | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| * | | | | | | | Add French translationVincent Le Gallic2018-03-141-0/+609
| | |/ / / / / / | |/| | | | | |
* | | | | | | | local-store - fix class syntaxkumavis2018-03-151-2/+2
* | | | | | | | local-store - check for error from extension.runtimekumavis2018-03-151-3/+28
* | | | | | | | local-store - fix promisification of methodskumavis2018-03-151-3/+2
| |/ / / / / / |/| | | | | |
* | | | | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-141-2/+4
|\ \ \ \ \ \
| * | | | | | tx-gas-utils - fix code stylekumavis2018-03-141-1/+1
| * | | | | | transactions move validation of the to field to validateRecipientfrankiebee2018-03-141-7/+3
| * | | | | | Merge remote-tracking branch 'origin/i#3509' into i#3509frankiebee2018-03-146-21/+703
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'master' into i#3509Frankie2018-03-146-21/+703
| | |\| | | | |
| * | | | | | | fix error messagefrankiebee2018-03-141-1/+1
| |/ / / / / /
| * | | / / / transactions - insure if a to field in tx params has a truthy valu that it is...frankiebee2018-03-141-1/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us...kumavis2018-03-142-6/+605
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Add sigRequest for Signature RequestThomas2018-03-131-0/+3
| * | | | | Merge branch 'master' into i18nThomas Huang2018-03-124-12/+95
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into i18nDan Finlay2018-03-071-3/+3
| |\ \ \ \ \
| * | | | | | Missing comma in messages.jsonDan2018-03-071-1/+1
| * | | | | | Merge branch 'master' into i18nDan2018-03-0724-25/+912
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | complete i18n across new UINick Doiron2018-01-302-69/+105
| * | | | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-241-125/+506
| * | | | | | first steps to i18nNick Doiron2018-01-231-1/+166
* | | | | | | lint fixkumavis2018-03-091-1/+1
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-Us...kumavis2018-03-092-9/+92
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-082-9/+92
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
| | * | | | | add documentationCsaba Solya2018-03-042-0/+9
| | * | | | | verify seedwords on log inCsaba Solya2018-03-041-3/+16
| | * | | | | verify addresses regardless caseCsaba Solya2018-03-031-1/+1
| | * | | | | fix lint issuesCsaba Solya2018-03-032-11/+11
| | * | | | | seed phrase verifierCsaba Solya2018-03-032-2/+61
* | | | | | | background - storage - cleanup storage wiringkumavis2018-03-092-34/+30
* | | | | | | Tighten up data loading codeDan Finlay2018-03-081-4/+8
* | | | | | | Add clarifying commentDan Finlay2018-03-081-0/+1
* | | | | | | Some fixes for new storage strategyDan Finlay2018-03-081-5/+9
* | | | | | | Increase storage debounce to 2sDan Finlay2018-03-081-1/+1
* | | | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-083-6/+6
|\| | | | | |
| * | | | | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-081-1/+1
| * | | | | | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
| | |_|_|/ / | |/| | | |
| * | | | | Version 4.2.0kumavis2018-03-071-3/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-0787-61/+1407
|\| | | |
| * | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-072-0/+77
| |\ \ \ \
| | * | | | make keyFromPassword privateCsaba Solya2018-02-231-3/+3
| | * | | | Merge branch 'master' into edge-supportCsaba S2018-02-2271-41/+562
| | |\ \ \ \
| | * | | | | add edge supportCsaba Solya2018-02-222-0/+77
| * | | | | | Version 4.1.3v4.1.3Dan Finlay2018-03-031-1/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-027-0/+644
| |\ \ \ \ \
| | * | | | | Check in all font files locally.Kevin Serrano2018-03-017-0/+644
| | | |_|_|/ | | |/| | |
| * | | | | 4.1.2kumavis2018-03-011-1/+1
| * | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-011-1/+1
| |\ \ \ \ \
| | * | | | | v4.1.1kumavis2018-03-011-1/+1
| | |/ / / /
| * | | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| * | | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-012-5/+41
| * | | | | sentry - clean - move setupRaven to libkumavis2018-03-013-3/+3
| |/ / / /
| * | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0Frankie2018-02-281-1/+1
| |\ \ \ \
| | * | | | Bump VersionThomas2018-02-281-1/+1
| | * | | | Version 4.0.0Thomas2018-02-231-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatchDan Finlay2018-02-281-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | sentry - report failed tx with more specific messagekumavis2018-02-171-1/+2
| * | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| |\ \ \ \
| | * | | | Prevents new transaction from generating popup when metamask is open in an ac...Dan2018-02-221-1/+11
| * | | | | Merge branch 'master' into uat-masterDan Finlay2018-02-224-3/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
| | |\ \ \ \
| | | * | | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
| | * | | | | Fix incorrect promise instantiationDan Finlay2018-02-161-1/+1
| | | |_|/ / | | |/| | |
| | * | | | Version 3.14.2v3.14.2Dan Finlay2018-02-161-1/+1
| | * | | | Merge pull request #3222 from MetaMask/mesh-testDan Finlay2018-02-162-0/+13
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | metamask mesh - inject mesh testing containerkumavis2018-02-112-0/+13
| | * | | | use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| | |/ / /
| * | / / Fix promise constructionDan Finlay2018-02-211-1/+1
| | |/ / | |/| |
| * | | Bump uat version to 4.0.12Dan2018-02-171-1/+1
| * | | Make oldui compatible with newUI style changesThomas Huang2018-02-161-2/+2
| * | | Merge branch 'uat' into uat-nextDan2018-02-086-10/+63
| |\ \ \
| | * | | Merge branch 'master' into uatDan2018-02-086-10/+63
| | |\| |
| | | * | Version 3.14.1v3.14.1Dan Finlay2018-02-021-1/+1
| | | * | Version 3.14.0Dan Finlay2018-02-021-1/+1
| | | * | Merge branch 'master' into localStorage-clean-upFrankie2018-02-013-0/+23
| | | |\ \
| | | | * | preserve other networks TXsBruno Barbieri2018-02-011-3/+4
| | | | * | use txMeta.txParamsBruno Barbieri2018-01-311-1/+1
| | | | * | wipe only transactions for current accountBruno Barbieri2018-01-313-9/+15
| | | | * | clean upBruno Barbieri2018-01-311-3/+3
| | | | * | added reset account featureBruno Barbieri2018-01-313-0/+16
| | | * | | remove RecentBlocks from diskfrankiebee2018-02-012-3/+2
| | | * | | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| | | * | | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
| | | |/ /
| | | * | Version 3.13.8v3.13.8Dan Finlay2018-01-301-1/+1
| | | * | Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| * | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-082-0/+26
| |/ / /
| * | / Merge branch 'master' into uatThomas2018-01-233-2/+14
| | |/ | |/|
| * | Merge branch 'uat' into newmasterChi Kei Chan2018-01-2069-40/+525
| |\ \
| | * | 4.0.10kumavis2018-01-191-1/+1
| | * | Update popout to fullscreen iconAlexander Tseung2018-01-181-0/+21
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 09:13:35 +0800