aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-07-10On branch masterLei Yan
2015-07-10On branch masterLei Yan
2015-05-12Merge https://github.com/zsloan/genenetwork2Lei Yan
2015-05-12Merge pull request #24 from lyan6/master...Committer: Lei Yan <lei@penguin.uthsc.edu>zsloan
2015-05-12Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-05-12Committer: Lei Yan <lei@penguin.uthsc.edu>...On branch master Lei Yan
2015-05-12Merge branch 'master' of github.com:genenetwork/genenetwork2pjotrp
2015-05-12Added pylmm instructionpjotrp
2015-05-12Resolved conflict before commitzsloan
2015-05-12Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-05-12Just removed some code that wasn't being usedzsloan
2015-05-12Merge pull request #20 from lomereiter/issue11...Fixes #11 (buttons on collection page)zsloan
2015-05-12Merge pull request #23 from pjotrp/master...Removing pylmm out of the GN2 treezsloan
2015-05-12Fix #35...* 'aliases' and 'location' are shown only where relevant * descriptions for phenotype datasets are provided at the top Artem Tarasov
2015-05-11Show PYLMM_PATH on errorPjotr Prins
2015-05-11Moved chunksPjotr Prins
2015-05-11More pylmm dependencies disabledpjotrp
2015-05-11Remove outdated codepjotrp
2015-05-11Moving pylmm out of the treepjotrp
2015-05-11pylmm has moved out of the GN2 source tree to https://github.com/genenetwork/...pjotrp
2015-05-11Fixed gen_select_dataset so that it does not include Phenotype and...Genotype groups when the corresponding data sets do not exist Interval Mapping no longer shows up for human traits Fixed the appearance of the mirror links on the main page zsloan
2015-05-11Merge branch 'master' of https://github.com/zsloan/genenetwork2pjotrp
2015-05-08Merge github.com:genenetwork/genenetwork2zsloan
2015-05-08Committing before pulling latest changes/fixeszsloan
2015-05-08updating histogram on values' change (#28)Artem Tarasov
2015-05-08fix histogram bin width...It was calculated wrongly when bins began from a non-zero value Artem Tarasov
2015-05-08fixArtem Tarasov
2015-05-08Fix #29...The number of bins was set to 20 for all datasets. Changed the number to be sqrt(#samples) as suggested on Wikipedia. Artem Tarasov
2015-05-08Merge branch 'master' of https://github.com/zsloan/genenetwork2Artem Tarasov
2015-05-07Merge pull request #22 from lomereiter/fix_trait_data_export...Fix trait data export (#21)zsloan
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_validation...email and pass validationzsloan
2015-05-06fix spacingArtem Tarasov
2015-05-06collection/view: bring buttons backArtem Tarasov
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 changes...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 zsloan
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