aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-06Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2015-04-06Removed the old news code before pulling over Lei's changeszsloan
Removed the SharingPage import from views since it doesn't exist anymore
2015-04-06Merge pull request #3 from pjotrp/masterzsloan
0.50-gn2-pre1
2015-04-06Removed dataSharing directory and its files since they aren't being used,zsloan
but I should note that a couple of them were changed from GN1; I think that there was some attempt to implement this very early into GN2's development, but we'd probably be better off starting from scratch since a number of things have changed since then (such as the way we call queries) Removed the Singapore link from the mirrors section of the index page since it wasn't working
2015-03-31Fixed some aesthetic issues on the main page and removed references to ↵zsloan
TemplatePage
2015-03-30Merge with zsloan masterPjotr Prins
2015-03-30Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloanPjotr Prins
2015-03-27Changed HTMLPATH in webqtlConfig since I forgot to in the last commit (since ↵zsloan
it used to point to the now-renamed 'web' directory). It obviously also needs to be renamed later, but I'll have to find every place that calls webqtlConfig.HTMLPATH first to do so.
2015-03-27Removed everything from 'web' directory except genofiles and renamed the ↵zsloan
directory to 'genotype_files'
2015-03-26Removed several unused files from the base folder and their references in ↵zsloan
other files
2015-03-25Pair scan image now loads properlyzsloan
2015-03-24Merge branch 'master' of github.com:DannyArends/genenetwork2zsloan
2015-03-24Added pair scan to the marker_regression_page viewzsloan
2015-03-24Added back css directory/fileszsloan
2015-03-24Change back port location and home directory location; this should be in ↵zsloan
external settings
2015-03-24Updates to the templateszsloan
2015-03-24Code updates to marker regressionzsloan
2015-03-24Removing the node.js + v8 code from the repository (this should be also ↵DannyArends
removed in the history), this should not be here since its a dependency not code we want to maintain ourselves
2015-03-23Minor update to get the pylmm code working on my instance of penguinDannyArends
2015-03-23Updates to make GN2 work on my version of penguin (ports, and paths)DannyArends
2015-03-23Adding my path to sys.path in pylmmDannyArends
2015-03-23Merge branch 'master' of github.com:pjotrp/genenetwork2DannyArends
2015-03-20Merge branch 'master' of https://github.com/zsloan/genenetwork2Pjotr Prins
2015-03-19Removing mapmethod mapmodel from the coffeescriptDannyArends
2015-03-19testing some moreDannyArends
2015-03-19Print initial start_varsDannyArends
2015-03-19Print wantedDannyArends
2015-03-19Print for testingDannyArends
2015-03-19Freaking comma ???DannyArends
2015-03-19Testing againDannyArends
2015-03-19Updating the coffee scriptDannyArends
2015-03-19Strungling with passing parametersDannyArends
2015-03-19This is getting more and more annoyingDannyArends
2015-03-19This front to back passing of parameters is just weirdDannyArends
2015-03-19Name method is already takenDannyArends
2015-03-19try last time, something is really weird between the front and the backendDannyArends
2015-03-19Test/DebugDannyArends
2015-03-19Adding the new options to views.pyDannyArends
2015-03-19Minor updates to the marker regression code for R/qtl, layout mostlyDannyArends
2015-03-19Receiving the chosen method and model in the python backend codeDannyArends
2015-03-19Adding the method and model option in the userinterfaceDannyArends
2015-03-19Adding the method and model parameters of R/qtl so that we can have the user ↵DannyArends
choose to use non-parametric QTL mapping, binary phenotypes, etc
2015-03-19Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloanPjotr Prins
2015-03-18Begun adding pair scan option, fixed bug if no closest markers foundzsloan
2015-03-18.cross files should not be in the repositoryzsloan
2015-03-18Fixed the borky genofilezsloan
2015-03-18Adding a fix to purge non-existing markers as covariates for the R/qtl analysiszsloan
2015-03-18Merge branch 'pylmm0002'Pjotr Prins
Conflicts: wqflask/wqflask/my_pylmm/pyLMM/lmm.py
2015-03-18Merge branch 'master' of https://github.com/zsloan/genenetwork2Pjotr Prins
2015-03-18Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloanPjotr Prins