aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-09-07Added the script to convert bimbam to kinship matriceszsloan
2017-09-05Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2017-09-05Added file converting genofiles to bimbamzsloan
2017-09-05Merge pull request #259 from pjotrp/testingzsloan
2017-09-04gemma-wrapper: find binary in profilePjotr Prins
2017-08-29Mostly changes related to getting gemma working with covariates and BIMBAM fi...zsloan
2017-07-06Merge pull request #256 from genenetwork/developmentzsloan
2017-07-06Merge branch 'testing' into developmentdevelopmentzsloan
2017-07-06Improved table appearance for global searcheszsloan
2017-07-03Merge pull request #255 from lyan6/masterzsloan
2017-06-30Fix Correlation Scatterplot axis formatLei Yan
2017-06-29Update Correlation ScatterplotLei Yan
2017-06-28Update Correlation ScatterplotLei Yan
2017-06-26Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-06-26Merge branch 'master' of github.com:genenetwork/genenetwork2Lei Yan
2017-06-26Fix Correlation Scatterplot thingsLei Yan
2017-06-14Changed color scale for heatmap to blue <-> white <-> redzsloan
2017-06-14Removed scatterplot matrix option since it isn't working correctly right nowzsloan
2017-06-14Added descriptions for GEMMA and PLINK as well as a warning about the issue w...zsloan
2017-06-13Fixed trait links in network graph nodeszsloan
2017-06-13Added to border to table footer in search resultszsloan
2017-06-13Fixed issue that caused haplotype analyst to no longer workzsloan
2017-06-13Fixed minor issue where the part of the legend describing the LRS/LOD line st...zsloan
2017-06-12Merge branch 'development' of github.com:genenetwork/genenetwork2 into develo...zsloan
2017-06-12Added explanatory text to heatmap pagezsloan
2017-06-12Fix binary paths for GEMMA_COMMAND, PYLMM_COMMAND and PLINK_COMMANDPjotr Prins
2017-06-12Fixed issue where 0.0 values would be converted into X's on the trait pagezsloan
2017-06-09Merge /home/staging/gene into developmentzsloan
2017-06-09- Changed the way the genofile is set so different genofiles can be selected ...zsloan
2017-06-02Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2017-06-02Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2017-06-02settings: GENENETWORK_FILESPjotr Prins
2017-06-02settings: do not enforce JS pathsPjotr Prins
2017-05-31Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2017-05-31Added various tool options to correlation results page and improved table app...zsloan
2017-05-31Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2017-05-31JS_GUIX_PATH may not be therePjotr Prins
2017-05-31Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2017-05-31JS module handlingPjotr Prins
2017-05-22Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2017-05-22Added submit trait to header menu and fixed some minor issues with Network Gr...zsloan
2017-05-22Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2017-05-22Added print lines showing url to views.py and updated dataset menu json filezsloan
2017-05-22Merge pull request #254 from pjotrp/diet-mergezsloan
2017-05-21Merge from the diet branch.Pjotr Prins
2017-05-16Fixed issue that caused mapping to not work for R/qtlzsloan
2017-05-08Merge pull request #253 from lyan6/masterzsloan
2017-05-08corr_scatter_plot update (use nvd3)Lei Yan
2017-05-04renamed: gn2_lei.conf -> gn2-lei.confLei Yan
2017-05-04Merge branch 'master' of github.com:genenetwork/genenetwork2Lei Yan
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-23 03:40:37 +0000