aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-02Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-10-02save as svg button workLei Yan
2017-09-22Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
2017-09-22Fixed issue that caused covariates to not work for certain data set groupszsloan
2017-09-22Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
2017-09-22Fixed issue that caused LOCO to not work when remapping or using single ↵zsloan
chromosome view
2017-09-21LOCO should work with GEMMA (when BIMBAM available), though I still need to ↵zsloan
do more testing
2017-09-14Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2017-09-14Committing current progress towards implementing LOCO for GEMMA, not done yetzsloan
2017-09-14Merge pull request #264 from pjotrp/testingzsloan
./bin/genenetwork2: add GEM_PATH for gemma-wrapper
2017-09-14./bin/genenetwork2: add GEM_PATH for gemma-wrapperPjotr Prins
2017-09-13update Correlation Scatterplot formatLei Yan
2017-09-12Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-09-12change corr_scatterplot precision formatLei Yan
2017-09-07Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
2017-09-07Updated show trait page to correctly show GEMMA options for certain data setszsloan
2017-09-07Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
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
gemma-wrapper: find binary in profile
2017-09-04gemma-wrapper: find binary in profilePjotr Prins
2017-08-29Mostly changes related to getting gemma working with covariates and BIMBAM ↵zsloan
file format Other changes include: - Fixing links in the network graph - Changing button colors on show trait page - Changing color scheme for heatmap - Making rows highlight in yellow when clicked on - Some changes to table appearance (like giving gene global search a horizontal scroll)
2017-08-23Update corr scatterplotLei Yan
2017-08-03remove bracketsLei Yan
2017-08-02Remove duplicate codesLei Yan
2017-08-02Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-08-02Update Correlation Scatterplot parametersLei Yan
2017-07-06Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
2017-07-06Merge pull request #256 from genenetwork/developmentzsloan
Variety of changes
2017-07-06Merge branch 'testing' into developmentdevelopmentzsloan
2017-07-06Improved table appearance for global searcheszsloan
Scatterplot Matrix works again Added the first few changes to get covariates working (not done yet)
2017-07-03Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-07-03Update Statistic table in Correlation ScatterplotLei Yan
2017-07-03Merge branch 'testing' of https://github.com/genenetwork/genenetwork2zsloan
2017-07-03Merge pull request #255 from lyan6/masterzsloan
Correlation Scatterplot updates
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
Removed an extraneous character in the gsearch_pheno html
2017-06-14Removed scatterplot matrix option since it isn't working correctly right nowzsloan
Removed Download as PNG option for Probability Plot since it also isn't working yet
2017-06-14Added descriptions for GEMMA and PLINK as well as a warning about the issue ↵zsloan
with GEMMA where you can't run it simultaneously on two traits from the same group
2017-06-13Fixed trait links in network graph nodeszsloan
Added warning notifying users that file upload option in the submit_trait page doesn't work yet
2017-06-13Added to border to table footer in search resultszsloan
2017-06-13Fixed issue that caused haplotype analyst to no longer workzsloan
Fixed Results table for centimorgan results to display cM instead of Mb
2017-06-13Fixed minor issue where the part of the legend describing the LRS/LOD line ↵zsloan
still appeared for manhattan plots
2017-06-12Merge branch 'development' of github.com:genenetwork/genenetwork2 into ↵zsloan
development