aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-02-08Fixed the logic if how the correlation page applies filters (mean expression,......Added back some colorbox directories that we apparently need (I had removed them in an earlier commit) zsloan
2016-02-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into development...Conflicts: .gitignore zsloan
2016-02-08Guix: installation notespjotrp
2016-02-08Renamed misc dir to docpjotrp
2016-02-08Removing LFSpjotrp
2016-02-08gitignore: resolved conflictpjotrp
2016-02-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into gn-masterpjotrp
2016-02-04Most importantly, this commit fixes an issue that caused the trait page to no......An Intro section is also added to the header, though for the time being its contents aren't populated and the edit option isn't working zsloan
2016-01-29Info button should now work for phenotype and genotype datasetszsloan
2016-01-27Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2016-01-27Added info button to Dataset dropdown on index page...Fixed script that generates dataset dropdown json file to include accession id Fixed dataset link on search results page zsloan
2016-01-26Removed a bunch of files/directories/packages that are no longer used and som...zsloan
2016-01-21MANIFEST: Ignore output datapjotrp
2016-01-21Adding html+js+css+img files into MANIFESTpjotrp
2016-01-19Adding Python setup.py supportpjotrp
2016-01-15Cofactor now works with reaperzsloan
2016-01-14Regular and single chr views work for qtl reaper now...Single chr now works for R/qtl (didn't before) Merged qtl reaper code into marker_regression.py zsloan
2016-01-12Mapping works for rqtl and centimorgan scalezsloan
2016-01-06Single chromosome view now works for mapping page using GN1's image code...Removed loading bar that appeared on show trait page since it didn't work with GN1 mapping (which opens in a new page) zsloan
2016-01-04Added headers/foots/css to mapping page...Mapping results table now works zsloan
2015-12-18Mapping results open in new window; still need to add header/footer/jszsloan
2015-12-18Added image map for figurezsloan
2015-12-15Added the js_data so both the GN1 and GN2 figures can be displayedzsloan
2015-12-14GN1 mapping full genome figure now correct for pylmm and output to web pagezsloan
2015-12-12Changed loop drawing qtl curve to fix some issues; still need to make it draw...zsloan
2015-12-09Disabled GN1 mapping for master branch; mistakenly pushed with it enabled beforezsloan
2015-12-09Fixed search result page text to make sense for all working search terms...Added a bunch of print statements to GN1 mapping code to locate where code stalls zsloan
2015-12-04Commented out code related to additive/dominance effect in gn1 marker regress...zsloan
2015-11-18Fixed issue where literature and tissue correlation didn't work...Scatterplot matrix feature only appears if user is logged in now Committing current progress on mapping page (it can at least import the file now, but there are still errors) zsloan
2015-11-18Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloanpjotrp
2015-11-09Fixed issue that caused mapping to not work; for some reason the path to pylm...zsloan
2015-11-05Fixed issue where misplaced html comment end hid all phenotype table resultszsloan
2015-10-23Fixed error if you click search after entering white spaces; Ethan's fix only...zsloan
2015-10-23Merge pull request #128 from sn3twork/issues/126...Fixes issue #126. zsloan
2015-10-23Merge pull request #125 from sn3twork/issues/98...Fixes issue #98. zsloan
2015-10-22Fixes issue #126. Fixed broken references to dbdoc folder. They now all...point to static/dbdoc. Added static/dbdoc folder. Ethan Willis
2015-10-22Fixes issue #98. Doesn't submit search request if the search request...contains *only* whitespace. Ethan Willis
2015-10-22Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-10-22Added factor loadings table and plot (though need to finish improving plot st......Fixed issue where cM locations for R/qtl were displayed as Mb and had used Mb Chr lenghts for the scale zsloan
2015-10-20Merge pull request #124 from sn3twork/enhancement/ui/wgcna_setup...Updated wgcna_setup to use Bootstrap error messages and form styling.zsloan
2015-10-20Merge pull request #121 from sn3twork/master...Fixes bug #98. Enhancementzsloan
2015-10-20Updated wgcna_setup to use Bootstrap error messages and form styling.Ethan Willis
2015-10-19Enhancement of fix for bug #98. Refuses submission of search form if...search terms are empty. This avoids an internal server error. Ethan Willis
2015-10-12Changed the location filter for correlation pagezsloan
2015-10-12Fixed an error page that occurs if traits with no overlapping samples are use...zsloan
2015-10-09Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2015-10-09Fixed correlations for phenotype datasets...Fixed table for some expression dataset searches Added collection button to correlation page Added color gradient to correlation matrix zsloan
2015-10-08Committer: Lei Yan <lei@penguin.uthsc.edu>...On branch master Lei Yan
2015-10-08Merge pull request #120 from DannyArends/WGCNAintegration...WGCNA integrationLei Yan
2015-10-08Using the correct NA from Rpy2DannyArends