aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-10-01Missed something when previously resolving the merge conflictzsloan
2018-10-01Resolved conflictzsloan
2018-10-01- Can now remove cofactors from correlation scatterplot and select them by ju...zsloan
2018-09-17Merge pull request #342 from pjotrp/gemma-20180915zsloan
2018-09-15Run gemma without debug and checks in productionPjotr Prins
2018-09-15ES commentPjotr Prins
2018-09-15Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingPjotr Prins
2018-09-15Run gemma without debug and checks in productionPjotr Prins
2018-08-23Added "change user to elasticsearch"zsloan
2018-08-15The issue with adding anonymous collections should be fixed nowzsloan
2018-08-15ES commentPjotr Prins
2018-08-14Fixed minor issue in user_manager.pyzsloan
2018-08-14Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2018-08-14Added cofactors to correlation scatterplot and changed it to use Plotlyzsloan
2018-08-10Added the command needed to start up elasticsearchzsloan
2018-07-06Added square root transform optionszsloan
2018-07-02Added option to transform/normalize trait sample values (log2 and qnorm) on t...zsloan
2018-06-08Added option to add traits to existing collection, which I had forgotten prev...zsloan
2018-06-08User collections (now stored in ElasticSearch) are reimplemented now and shou...zsloan
2018-05-25Fixed issue causing anonymous collections to not work on my branch and stagin...zsloan
2018-05-17Added script to quantile normalize a data set and enter its normalized sample...zsloan
2018-05-01Merge /home/lei/gene into testingzsloan
2018-05-01Removed all code related to using GEMMA with PLINK input fileszsloan
2018-04-27Added marker filtering for data set groups with larger genotype fileszsloan
2018-04-23Changed GEMMA mapping to use -lmm 2 (Likelihood ratio test) as a parameter in...zsloan
2018-04-19Changed width of top bar and a couple other html objects to 100% instead of s...zsloan
2018-04-18Removed a little more code in webqtlDatabaseFunction.py and do_searchzsloan
2018-04-16Undoing changes to user_manager.py, because I think they may have caused some...zsloan
2018-04-16Resolved conflicts after pulling changeszsloan
2018-04-16Removed some unused code from collect.py and user_manager.pyzsloan
2018-04-16Removed file tracer.py that wasn't being usedzsloan
2018-04-16Removed a bunch of unused code from the following files:zsloan
2018-04-16Merge pull request #318 from pjotrp/testingzsloan
2018-04-16Merge branch 'testing' of https://github.com/fredmanglis/genenetwork2 into te...Pjotr Prins
2018-04-16Merge pull request #317 from pjotrp/testingzsloan
2018-04-16Remove statements that might be causing issuesMuriithi Frederick Muriuki
2018-04-16login messages improvedPjotr Prins
2018-04-16Merge remote-tracking branch 'pjotrp/testing' into testingMuriithi Frederick Muriuki
2018-04-16Update mappings for Elasticsearch 6.2. Update loggerMuriithi Frederick Muriuki
2018-04-16Docs on elasticsearch usePjotr Prins
2018-04-15Deactivate analysis of email_address fieldMuriithi Frederick Muriuki
2018-04-15Add tests for Forgot Password featureMuriithi Frederick Muriuki
2018-04-15Use existing code. Delay after delete.Muriithi Frederick Muriuki
2018-04-15Fix issue with indentationMuriithi Frederick Muriuki
2018-04-13Check email provided on forgot passwordMuriithi Frederick Muriuki
2018-04-13Fix logging in testsMuriithi Frederick Muriuki
2018-04-13Use single entry-point for testsMuriithi Frederick Muriuki
2018-04-13Merge remote-tracking branch 'pjotrp/testing' into testingMuriithi Frederick Muriuki
2018-04-12Merge pull request #315 from pjotrp/testingzsloan
2018-04-12README and docsPjotr Prins