aboutsummaryrefslogtreecommitdiff
path: root/wqflask
AgeCommit message (Expand)Author
2015-07-10On branch masterLei Yan
2015-05-12Merge pull request #24 from lyan6/master...Committer: Lei Yan <lei@penguin.uthsc.edu>zsloan
2015-05-12Committer: Lei Yan <lei@penguin.uthsc.edu>...On branch master Lei Yan
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-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-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-07Excel export of trait dataArtem Tarasov
2015-05-07fix CSV export of trait dataArtem Tarasov
2015-05-07allow for attribute table to not existArtem Tarasov
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-10Added git large file system (the .gitattributes files) and fixed an issue whe...zsloan
2015-04-06Added secure_server.py to gitignore and fixed conflicts for merging Lei's new...zsloan
2015-04-06Just committing a couple minor bug fixes to get code working after pulling Pj...zsloan
2015-04-06Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2015-04-06Removed the old news code before pulling over Lei's changes...Removed the SharingPage import from views since it doesn't exist anymore zsloan
2015-04-06Merge pull request #3 from pjotrp/master...0.50-gn2-pre1zsloan
2015-04-06Removed dataSharing directory and its files since they aren't being used,...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 zsloan
2015-03-31Fixed some aesthetic issues on the main page and removed references to Templa...zsloan
2015-03-30Merge with zsloan masterPjotr Prins
2015-03-27Changed HTMLPATH in webqtlConfig since I forgot to in the last commit (since ...zsloan
2015-03-27Removed everything from 'web' directory except genofiles and renamed the dire...zsloan
2015-03-26Removed several unused files from the base folder and their references in oth...zsloan
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 exte...zsloan
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 remov...DannyArends
2015-03-23Minor update to get the pylmm code working on my instance of penguinDannyArends