aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-10-31Fix spacingPjotr Prins
2016-10-31Merge branch 'master' of github.com:lyan6/genenetwork2 into lyanPjotr Prins
2016-10-29For those case that we have multiple genotypes we would like to add a selector.Lei Yan
2016-10-25Merge pull request #216 from zsloan/master...Replaced Download Table in view_collection page with python versionPjotr Prins
2016-10-25Just removed some extraneous spaces in trait.pyzsloan
2016-10-25Replaced the Download Table button for collection page with python version th......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) zsloan
2016-10-24Merge pull request #214 from zsloan/master...Thanks! Download table rewritten in Python to add extra functionalityPjotr Prins
2016-10-21Added CSV table download option to both gene and pheno global search...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 zsloan
2016-10-21Added metadata to "Download Table"...Only checked traits are now downloaded and all traits are downloaded if nothing is checked zsloan
2016-10-19Rewrote export CSV in python...Still need to add metadata and change it to where only selected traits are exported zsloan
2016-10-18Merge pull request #213 from zsloan/development...Fixed issue where period sometimes appeared incorrectly in search res…Pjotr Prins
2016-10-17Fixed issue where period sometimes appeared incorrectly in search results text....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 zsloan
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 work......Ran some end of line conversion on rqtl_mapping because there were a few ^M's zsloan
2016-10-12Removed unused gemma code from marker_regression.py and changed the order of ...zsloan
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....Fixed CTL template to display correct number of traits (previously it would display 1 fewer than you selected). zsloan
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 TEMPDIR...Throw error when TMPDIRs are not writable Pjotr Prins
2016-10-07Startup script: add profile to the PATH and set LC_ALL to default to C (shoul...Pjotr Prins
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