aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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/testing...gemma-wrapper: find binary in profilezsloan
2017-09-04gemma-wrapper: find binary in profilePjotr Prins
2017-08-29Mostly changes related to getting gemma working with covariates and BIMBAM fi......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) zsloan
2017-07-06Merge pull request #256 from genenetwork/development...Variety of changeszsloan
2017-07-06Merge branch 'testing' into developmentdevelopmentzsloan
2017-07-06Improved table appearance for global searches...Scatterplot Matrix works again Added the first few changes to get covariates working (not done yet) zsloan
2017-07-03Merge pull request #255 from lyan6/master...Correlation Scatterplot updateszsloan
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 <-> red...Removed an extraneous character in the gsearch_pheno html zsloan
2017-06-14Removed scatterplot matrix option since it isn't working correctly right now...Removed Download as PNG option for Probability Plot since it also isn't working yet zsloan
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 nodes...Added warning notifying users that file upload option in the submit_trait page doesn't work yet zsloan
2017-06-13Added to border to table footer in search resultszsloan
2017-06-13Fixed issue that caused haplotype analyst to no longer work...Fixed Results table for centimorgan results to display cM instead of Mb zsloan
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 ......- Now shows error page for Correlation Matrix if traits aren't all from the same group (later need to make it check for shared samples, since different groups may contain some of the same samples - Mapping results page now displays the genofile in the information section - Only show Interval Analyst if species is mouse or rat (previously it would show a blank table for other species) - Network Graph now only shows links in a node's info if the relevant information (for example geneid) exists, and the label changes depending on the type of data set - Other minor changes to the appearance of the Network Graph menu (less white space, plus clickable descriptions for a couple options) - Improved Correlations Results page to shorten Description and Authors cell content for Phenotype traits (to keep table width manageable) - Changed the glossary links for LRS and Additive Effect columns for Gene Global Search - Improved appearance for Phenotype Global Search results - Temporarily removed Mapping options/features that don't work from the trait page 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......Fixed minor logic issue in trait.py 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-merge...Merge from the diet branchzsloan
2017-05-21Merge from the diet branch.... * refactored ./bin/genenetwork2 and /etc/default_settings - better detection of Guix - removed unused parameters, such as GEMMA_RESULT_PATH and TEMP_TRAITS - removing some default settings, such as PYLMM_COMMAND - rename some settings, such as SQL_URI and LOG_SQL_ALCHEMY - added GUIX_JS_PATH for JS modules * Added documentation on installing binary GN2 * Updated Twitter board to latest version in Guix - it had broken * Updated many tools in the latest Guix profile Pjotr Prins
2017-05-16Fixed issue that caused mapping to not work for R/qtl...Updated dataset menu dropdown info Began adding option to download statistics figures as PNG zsloan
2017-05-08Merge pull request #253 from lyan6/master...renamed: gn2_lei.conf -> gn2-lei.confzsloan
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......Improved collection list and view table appearances Added question mark image for glossary entries in table headers Fixed issue where extra decimal place sometimes appeared in bar chart Y axis tick values zsloan