aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-25Merge pull request #216 from zsloan/masterPjotr Prins
Replaced Download Table in view_collection page with python version
2016-10-25Just removed some extraneous spaces in trait.pyzsloan
2016-10-25Replaced the Download Table button for collection page with python version ↵zsloan
that displays metadata, etc Removed currently unused javascript and css imports related to the DataTables buttons import (since it was replaced with the python export) from regular search, both global searches, and the view_collection page Added a bunch of parameters to the jsonable function for the GeneralTrait object in order to later create a json version of the search results and implement the client-side Scroller feature (which dynamically loads table rows from json when you scroll)
2016-10-24Merge pull request #214 from zsloan/masterPjotr Prins
Thanks! Download table rewritten in Python to add extra functionality
2016-10-21Added CSV table download option to both gene and pheno global searchzsloan
The "Database" part of the metadata isn't displayed for global search table downloads In both regular and global search, the table can not be sorted by whether the first column is checked Removed some unused datatables/javascript from the regular and global search page html
2016-10-21Added metadata to "Download Table"zsloan
Only checked traits are now downloaded and all traits are downloaded if nothing is checked
2016-10-19Rewrote export CSV in pythonzsloan
Still need to add metadata and change it to where only selected traits are exported
2016-10-18Merge pull request #213 from zsloan/developmentPjotr Prins
Fixed issue where period sometimes appeared incorrectly in search res…
2016-10-17Fixed issue where period sometimes appeared incorrectly in search results text.zsloan
Changed formatting of a couple things in search results text (capitalizing/underlining "terms" and bolding the search term) Changed "Gene" label on trait page to "NCBI" and removed GenBank link
2016-10-15Merge branch 'zsloan' into testingPjotr Prins
2016-10-15Remove all spacing introduced by mergePjotr Prins
2016-10-13Tests: require jsonPjotr Prins
2016-10-13Tests: require jsonPjotr Prins
2016-10-13Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloanPjotr Prins
2016-10-12Moved plink code out of marker_regression, though I don't think plink is ↵zsloan
working right now Ran some end of line conversion on rqtl_mapping because there were a few ^M's
2016-10-12Removed unused gemma code from marker_regression.py and changed the order of ↵zsloan
a couple functions in collect.py to more accurately reflect when they're called
2016-10-11Merge branch 'pjotr-gn2' into testingPjotr Prins
2016-10-09Handle VERSION on different pagesPjotr Prins
2016-10-09Merge branch 'mechanize' into testingPjotr Prins
2016-10-09Revert on Zach tabs and trailing spacesPjotr Prins
2016-10-09Tests: change optionsPjotr Prins
2016-10-09CTL: show correct # of phenotypes also in results pagePjotr Prins
2016-10-09Add version informationPjotr Prins
2016-10-09Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloanPjotr Prins
2016-10-09Changed mirrors & affiliates on wqflask/wqflask/templates/index_page_orig.htmlPjotr Prins
2016-10-09Merge branch 'twitter' into pjotr-gn2Pjotr Prins
2016-10-09Merge branch 'testing' into twitterPjotr Prins
2016-10-09Changed mirrors & affiliates on wqflask/wqflask/templates/index_page_orig.htmlPjotr Prins
2016-10-09Added links to base.htmlPjotr Prins
2016-10-07Removed qtlreaper code from marker_regression and moved it to a separate file.zsloan
Fixed CTL template to display correct number of traits (previously it would display 1 fewer than you selected).
2016-10-07Make sure JS path existsPjotr Prins
2016-10-07Twitter: added news list to search pagePjotr Prins
2016-10-07Tweets on main page are workingPjotr Prins
2016-10-07Add JS path to TWITTER_POST_FETCHERPjotr Prins
2016-10-07Changed error outputPjotr Prins
2016-10-07Saner handling of TMPDIR and TEMPDIRPjotr Prins
Throw error when TMPDIRs are not writable
2016-10-07Startup script: add profile to the PATH and set LC_ALL to default to C ↵Pjotr Prins
(should be changed some day)
2016-10-06URLs: replaced non-functioning URLsPjotr Prins
2016-10-06Footer: updating URLsPjotr Prins
2016-10-06Do not open new page in browser on URLPjotr Prins
2016-10-06Removed dead URLPjotr Prins
2016-10-06URL: replaced dead Memphis URL with current GN2 machinePjotr Prins
2016-10-06URL: prevent opening new pagesPjotr Prins
2016-10-06URL: updated Amigo reference on front pagePjotr Prins
2016-10-06URLs: update GO database URL and removed opening new browser pagesPjotr Prins
2016-10-06Logger: add more granular debug messagesPjotr Prins
2016-10-06Merge branch 'master' of github.com:genenetwork/genenetwork2 into mechanizePjotr Prins
2016-10-06CTL requires 2 traits minimally. Also use traits/phenotypes consistentlyPjotr Prins
2016-10-05CTL now displays proper error if fewer than 4 traits are selected. Also, ↵zsloan
WGCNA previously incorrectly gave an error when fewer than 5 traits were selected instead of fewer than 4 (because it said '<= 4'). I also improved the formatting for the html for both CTl and WGCNA Analysis.
2016-10-05Show datasets only on debugPjotr Prins