aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+1
* Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-261-1/+1
|\
| * Fix X-Frame-Options for mascaratmashuang2017-10-251-1/+1
* | Add BuyEtherWidget for future use in buy ether modalChi Kei Chan2017-10-251-0/+197
|/
* Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-251-7/+8
|\
| * Fix lint warningsDaijiro Wachi2017-10-221-7/+8
* | Add error messages when importing an accounttmashuang2017-10-241-16/+22
* | Add Import With Seed PhraseChi Kei Chan2017-10-214-4/+133
* | Add mobile responsivenessChi Kei Chan2017-10-211-2/+73
* | Remove import optionChi Kei Chan2017-10-211-1/+3
* | Fix importChi Kei Chan2017-10-211-21/+31
* | Fix capitializationChi Kei Chan2017-10-211-1/+1
* | Add Integration TestsChi Kei Chan2017-10-211-5/+5
* | ShapeShift IntegrationChi Kei Chan2017-10-213-86/+245
* | Add ShapeShift UIChi Kei Chan2017-10-212-72/+257
* | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-212-20/+20
* | Move "Skip this step" to side panelJacky Chan2017-10-212-12/+17
* | Disable CTA unless notice is scrolled to bottomJacky Chan2017-10-212-4/+29
* | Fix Buy Ether flowJacky Chan2017-10-212-2/+5
* | Shuffle tokensJacky Chan2017-10-212-22/+38
* | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-217-67/+104
* | Hide Warning after changing import optionsJacky Chan2017-10-212-5/+10
* | Implement Buy Ether Screen UIJacky Chan2017-10-213-8/+318
* | Implement Import Account ScreenJacky Chan2017-10-214-6/+311
* | Add BackupPhraseScreenJacky Chan2017-10-214-7/+394
* | Add NoticeScreenJacky Chan2017-10-213-7/+104
* | Add UniqueImageScreenJacky Chan2017-10-217-43/+298
* | Add BreadcrumbsJacky Chan2017-10-213-2/+47
* | CreatePasswordScreenJacky Chan2017-10-213-3/+104
* | Adding CreatePasswordScreenJacky Chan2017-10-213-1/+68
|/
* mascara - set x-frame-options header to DENYfrankiebee2017-10-201-1/+1
* mascara/background: use async awaitfrankiebee2017-10-051-20/+13
* use log.debugfrankiebee2017-10-051-3/+3
* mascara: linting and code clean upfrankiebee2017-10-055-58/+41
* mascara:exampl/app - add a send tx buttonfrankiebee2017-10-052-8/+22
* mascara: turn off backgroundfrankiebee2017-09-201-2/+1
* require metamascarafrankiebee2017-09-195-140/+22
* test - mascara - move skip reload test flagkumavis2017-09-161-0/+1
* mascara - proxy - small cleanupkumavis2017-09-161-2/+1
* tests - integration - mascara - small cleanup and timeout adjustmentskumavis2017-09-161-4/+2
* set time if platform is mascarafrankiebee2017-09-161-0/+1
* remove testem filesfrankiebee2017-09-162-34/+0
* dont reload on initial download and wait before passing sw to uifrankiebee2017-09-162-16/+26
* tests - integration - get flat and mascara tests closer to compatiblekumavis2017-09-143-125/+3
* tests - start migrating mascara tests to karmakumavis2017-09-143-7/+20
* mascara - fix iframe stream constructorkumavis2017-09-022-4/+4
* Merge pull request #1574 from MetaMask/internfixDan Finlay2017-06-131-1/+1
|\
| * Modify wording to new accept.Kevin Serrano2017-06-101-1/+1
| * continue button changed to agreeNihar2017-05-171-1/+1
* | reload page if ui is not presentfrankiebee2017-06-091-2/+6
* | reload the page when switching networksfrankiebee2017-06-091-3/+2
* | clean up codefrankiebee2017-06-091-5/+0
|/
* mascara - fix deploy instructionskumavis2017-05-161-1/+1
* mascara - ui - fix scale on mobilekumavis2017-05-161-1/+2
* mascara - add deploy instructionskumavis2017-05-161-2/+11
* clean up codefrankiebee2017-04-293-5/+3
* General cleanup and window reload if an update is foundfrankiebee2017-04-284-12/+17
* break out IndexDbController && Run the first time test on mascarafrankiebee2017-04-287-81/+43
* Setup test enviroment for mascarafrankiebee2017-04-289-0/+231
* Update README for mascarafrankiebee2017-04-271-11/+3
* Clean up codefrankiebee2017-04-221-14/+13
* Reduce wakeup time for firefoxfrankiebee2017-04-211-1/+1
* Fix for firefoxfrankiebee2017-04-211-55/+39
* fix syntaxfrankiebee2017-04-071-1/+1
* uncomment intervalDelayfrankiebee2017-04-071-1/+1
* match intervalsfrankiebee2017-04-071-1/+2
* Fix wakeUps:frankiebee2017-04-072-5/+5
* remove unnecessary listnerfrankiebee2017-04-071-6/+1
* Ping service worker to keep it from going idlefrankiebee2017-04-072-2/+13
* mascara - ready to deploy via dockerkumavis2017-04-061-4/+4
* mascara - mascara lib - read mascara origin from env varkumavis2017-04-061-17/+14
* mascara - rename popup to uikumavis2017-04-052-3/+3
* mascara - rename things + break out mascara asset serverkumavis2017-04-0511-114/+135
* add platforms to mascara + move buyEther window open to uikumavis2017-04-052-1/+12
* Remove out of date commentsfrankiebee2017-04-041-9/+1
* Fix first install flowfrankiebee2017-04-042-11/+4
* Update todos on READMEfrankiebee2017-04-031-0/+4
* Update MetaMascara READMEfrankiebee2017-04-031-11/+3
* Rename mascara root directoryfrankiebee2017-04-0312-0/+605