aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-08gitignore: resolved conflictpjotrp
2016-02-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into gn-masterpjotrp
2016-01-27Added info button to Dataset dropdown on index pagezsloan
Fixed script that generates dataset dropdown json file to include accession id Fixed dataset link on search results page
2016-01-21MANIFEST: Ignore output datapjotrp
2016-01-21Adding html+js+css+img files into MANIFESTpjotrp
2016-01-19Adding Python setup.py supportpjotrp
2015-12-12Changed loop drawing qtl curve to fix some issues; still need to make it ↵zsloan
draw to different chr areas though
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 termszsloan
Added a bunch of print statements to GN1 mapping code to locate where code stalls
2015-12-04Commented out code related to additive/dominance effect in gn1 marker ↵zsloan
regression code; gn1 code now runs without errors but still need to give output to template
2015-11-18Fixed issue where literature and tissue correlation didn't workzsloan
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)
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 ↵zsloan
pylmm was wrong
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 ↵zsloan
only worked when the user hits enter
2015-10-23Merge pull request #128 from sn3twork/issues/126zsloan
Fixes issue #126.
2015-10-23Merge pull request #125 from sn3twork/issues/98zsloan
Fixes issue #98.
2015-10-22Fixes issue #126. Fixed broken references to dbdoc folder. They now allEthan Willis
point to static/dbdoc. Added static/dbdoc folder.
2015-10-22Fixes issue #98. Doesn't submit search request if the search requestEthan Willis
contains *only* whitespace.
2015-10-22Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-10-22Added factor loadings table and plot (though need to finish improving plot ↵zsloan
still) Fixed issue where cM locations for R/qtl were displayed as Mb and had used Mb Chr lenghts for the scale
2015-10-20Merge pull request #124 from sn3twork/enhancement/ui/wgcna_setupzsloan
Updated wgcna_setup to use Bootstrap error messages and form styling.
2015-10-20Merge pull request #121 from sn3twork/masterzsloan
Fixes bug #98. Enhancement
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 ifEthan Willis
search terms are empty. This avoids an internal server error.
2015-10-12Changed the location filter for correlation pagezsloan
2015-10-12Fixed an error page that occurs if traits with no overlapping samples are ↵zsloan
used for correlation matrix
2015-10-09Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2015-10-09Fixed correlations for phenotype datasetszsloan
Fixed table for some expression dataset searches Added collection button to correlation page Added color gradient to correlation matrix
2015-10-08Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-10-08Merge pull request #120 from DannyArends/WGCNAintegrationLei Yan
WGCNA integration
2015-10-08Using the correct NA from Rpy2DannyArends
2015-10-08Minor, adding a better check for NADannyArends
2015-10-08Adding more commentsDannyArends
2015-10-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into ↵DannyArends
WGCNAintegration
2015-10-08User inputs are now passed to the algorithm, and power is tested, and ↵DannyArends
autoselected. We need to discuss which parameters we want to expose to the user.
2015-10-08Massive update to the templates, adding error checking and handling + the ↵DannyArends
eigen genes per module
2015-10-07Adding library for slider used with correlation toolzsloan
2015-10-07The results now show the soft thresholds table, and the gene <-> module tableDannyArends
2015-10-07Passing more information calculated by WGCNA to the results pageDannyArends
2015-10-07Merge branch 'master' of github.com:genenetwork/genenetwork2 into ↵DannyArends
WGCNAintegration
2015-10-05Correlation Matrix page is partially complete + fixed some issues with ↵zsloan
column resizing on global search pages
2015-09-27Merge branch 'master' of github.com:genenetwork/genenetwork2 into ↵DannyArends
WGCNAintegration
2015-09-25Forgot to add the table-striped class to the basic stats table to make its ↵zsloan
style the same as other tables
2015-09-25Made the basic statistics table look nicer and got rid of the foo column if ↵zsloan
only one sample group
2015-09-24Location range feature should work for correlations now, though the ↵zsloan
interface appearance needs to be improved
2015-09-20Using the webqtlConfig.TMPDIR constant and the webqtlUtil.genRandStr functionDannyArends
2015-09-20Now able to run WGCNA analysis on a user defined collection, still lots of todosDannyArends
2015-09-20Display the results from WGCNA updatedDannyArends
2015-09-20Transfering data from python to R for WGCNA analysis using Rpy2DannyArends