aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-08Merge branch 'master' of https://github.com/zsloan/genenetwork2Artem Tarasov
2015-05-07Merge pull request #22 from lomereiter/fix_trait_data_exportzsloan
Fix trait data export (#21)
2015-05-07Excel export of trait dataArtem Tarasov
2015-05-07Merge branch 'master' of https://github.com/zsloan/genenetwork2Pjotr Prins
2015-05-07fix CSV export of trait dataArtem Tarasov
2015-05-07allow for attribute table to not existArtem Tarasov
2015-05-06Merge pull request #18 from lomereiter/login_form_validationzsloan
email and pass validation
2015-05-06email and pass validationArtem Tarasov
2015-05-01Commented out imports of a few files that aren't used yet or stored in gitzsloan
2015-05-01Added Pjotr's latest pylmm changeszsloan
Added GEMMA and necessary plink-format genotype files in gemma directory Added the GEMMA genotype files to git LFS Removed some unnecessary/duplicated code from interval_mapping.py Separated GEMMA mapping code into its own file (will also do this for other methods) and fixed and issue that caused it to not run Added the table to the pair scan results page and wrote some code adding its attributes to each marker object, but it still isn't working yet
2015-04-19Pick up PYLMM_PATH from environment or setting.pyPjotr Prins
2015-04-19Pick up PYLMM_PATH from environment or setting.pyPjotr Prins
2015-04-19pylmm: ReleasePjotr Prins
2015-04-19pylmm: can now be called from GN2 without path setPjotr Prins
2015-04-19pylmm: auto add to pythonpathPjotr Prins
2015-04-19pylmm: move temp_data localPjotr Prins
2015-04-19pylmm: module loadingPjotr Prins
2015-04-19pylmm: Copied benchmark (preparing for a module)Pjotr Prins
2015-04-19Output configiPjotr Prins
2015-04-19runserver: set portPjotr Prins
2015-04-19INSTALL: refer to information in ./miscPjotr Prins
2015-04-19Restore logger in runserverPjotr Prins
2015-04-19pylmm: Edit conflictPjotr Prins
2015-04-19INSTALL infoPjotr Prins
2015-04-18Show first 40 LOD scoresPjotr Prins
2015-04-18Disable some print statements - will introduce debug levels soonPjotr Prins
2015-04-18Fix NA to float tranformsPjotr Prins
2015-04-18pylmm: fix integration problemsPjotr Prins
2015-04-18pylmm: fix integration problemsPjotr Prins
2015-04-18Use reduced outputter for GN2 logs tooPjotr Prins
2015-04-17Merge branch 'lmm' of github.com:pjotrp/genenetwork2 into lmmPjotr Prins
2015-04-17spacingPjotr Prins
2015-04-17INSTALLPjotr Prins
2015-04-17Merge branch 'master' into lmmPjotr Prins
2015-04-13Merge branch 'lmm' of github.com:pjotrp/genenetwork2 into lmmPjotr Prins
2015-04-13Started on INSTALL informationPjotr Prins
2015-04-13Added examples for convertlmm.pyPjotr Prins
2015-04-13Improved assertion messagePjotr Prins
2015-04-10Added git large file system (the .gitattributes files) and fixed an issue ↵zsloan
where rat trait pages wouldn't work
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)