aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-17spacingPjotr Prins
2015-04-17INSTALLPjotr Prins
2015-04-17Merge branch 'master' into lmmPjotr Prins
2015-04-13Started on INSTALL informationPjotr Prins
2015-04-13Added examples for convertlmm.pyPjotr Prins
2015-04-06Added secure_server.py to gitignore and fixed conflicts for merging Lei's ↵zsloan
new code
2015-04-06Just committing a couple minor bug fixes to get code working after pulling ↵zsloan
Pjotr's latest changes
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-04-04Regression testsPjotr Prins
2015-04-04Fixing transpose issuesPjotr Prins
2015-04-04Run works without transposesPjotr Prins
2015-04-04Consolidate tests now they all agree for redis, redis_new and runPjotr Prins
2015-04-03- Calculate n,m from the startPjotr Prins
- added test function to runlmm.py to run without Redis (25% faster)
2015-04-03Rename gwas_using_redis to gwas_with_redisPjotr Prins
2015-04-03temp_data is no longer passed aroundPjotr Prins
2015-04-03Refactoring Redis use to one functionPjotr Prins
2015-04-03Passing in an iteratorPjotr Prins
2015-04-03Refactoring GN2 interfacePjotr Prins
2015-04-02Passing in an iteratorPjotr Prins
2015-04-02Prepare iteratorPjotr Prins
2015-04-02Create test geno iteratorPjotr Prins
2015-04-02Release 0.50-gn2Pjotr Prins
2015-04-02Make the new version of genotype normalization defaultPjotr Prins
2015-03-31Fixed some aesthetic issues on the main page and removed references to ↵zsloan
TemplatePage
2015-03-30Refactoring genotype normalizationPjotr Prins
2015-03-30Use of is vs == when testing NonePjotr Prins
2015-03-30Percentage complete: Add method descriptionPjotr Prins
2015-03-30Merge branch 'master' into lmmPjotr Prins
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-20Fall back on calculate_kinship_new againPjotr Prins
2015-03-20Trying to get kinship_old back in lmm1Pjotr Prins