aboutsummaryrefslogtreecommitdiff
path: root/wqflask
AgeCommit message (Collapse)Author
2015-05-15reduce number of queriesArtem Tarasov
2015-05-13Fixed issue where you could change the Make Default button's textzsloan
2015-05-13Fixed sorting on the trait page so that x values always appear at the bottomzsloan
2015-05-13Improved sorting for columns with N/A or missing valueszsloan
2015-05-13Merge pull request #39 from pjotrp/masterzsloan
Refactoring finding tools such as pylmm
2015-05-13comment out sql query loggingArtem Tarasov
2015-05-13combine three similar queries into oneArtem Tarasov
2015-05-13replace multiple tissue queries with a single oneArtem Tarasov
2015-05-13cache datasets for each groupArtem Tarasov
2015-05-12Add info to warningpjotrp
2015-05-12Remove app linepjotrp
2015-05-12More elaborate handling of finding pylmmPjotr Prins
2015-05-12Move path search into tools.pypjotrp
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/issue11zsloan
Fixes #11 (buttons on collection page)
2015-05-12Fix #35Artem Tarasov
* 'aliases' and 'location' are shown only where relevant * descriptions for phenotype datasets are provided at the top
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 ↵pjotrp
https://github.com/genenetwork/pylmm_gn2
2015-05-11Fixed gen_select_dataset so that it does not include Phenotype andzsloan
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
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 widthArtem Tarasov
It was calculated wrongly when bins began from a non-zero value
2015-05-08fixArtem Tarasov
2015-05-08Fix #29Artem Tarasov
The number of bins was set to 20 for all datasets. Changed the number to be sqrt(#samples) as suggested on Wikipedia.
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 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-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-03-31Fixed some aesthetic issues on the main page and removed references to ↵zsloan
TemplatePage
2015-03-30Merge with zsloan masterPjotr 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'