aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2017-04-25Fixed issue with correlation result trait links if target dataset is differen...zsloan
2017-04-17Added option to remove collections from collection list pagezsloan
2017-04-06Merge branch 'master' of github.com:genenetwork/genenetwork2Lei Yan
2017-04-05Added images directory with various gifs, etczsloan
2017-04-05Merge branch 'testing' of github.com:genenetwork/genenetwork2 into developmentzsloan
2017-04-05Merge pull request #251 from lyan6/masterzsloan
2017-04-05- Temporary traits can be created, viewed, and added to collectionszsloan
2017-04-04Change scatterplot title font sizeLei Yan
2017-04-04Change scatterplot image buffer/innerLei Yan
2017-04-04align X and Y meta infoLei Yan
2017-03-30Change "Correlation Scatterplot" size, font, color, etc.Lei Yan
2017-03-16Merge branch 'testing' of github.com:genenetwork/genenetwork2Lei Yan
2017-03-16Merge /home/zas1024/geneLei Yan
2017-03-16Add meta info (X axis, Y axis) for Correlation ScatterplotLei Yan
2017-02-09Merge pull request #247 from zsloan/masterzsloan
2017-02-09Fixed issue where I forgot to add GeneticType to the query_for_group query fo...zsloan
2017-02-09Changed second column header to 'Value' when there's only one sample groupzsloan
2017-02-09Merge pull request #246 from zsloan/masterzsloan
2017-02-09Added genetic_type to DatasetGroup object to differentiate between which grou...zsloan
2017-02-08Merge pull request #245 from zsloan/masterzsloan
2017-02-08Changed the way .fam files are written/read, which fixes the issue with GEMMA...zsloan
2017-02-06Merge pull request #242 from zsloan/masterzsloan
2017-02-06Mapping results figure now correctly says whether GEMMA was used as mapping m...zsloan
2017-02-06Merge pull request #241 from zsloan/masterzsloan
2017-02-06Merge branch 'development' of github.com:zsloan/genenetwork2zsloan
2017-02-06Commented out reference to trait_submission since it's not used yetzsloan
2017-02-06Merge pull request #240 from zsloan/masterzsloan
2017-02-06Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2017-02-06Fixed appearance of several tables (search, mapping results, sample data)zsloan
2017-02-02Merge /home/zas1024/geneLei Yan
generated by cgit v1.2.3 (git 2.44.0) at 2024-12-02 07:49:18 +0000