aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-21Merge pull request #235 from lyan6/masterPjotr Prins
Thanks. Fix sql error: (GeneNetwork error: (_mysql_exceptions.OperationalErro…
2016-11-18Fix sql error: (GeneNetwork error: (_mysql_exceptions.OperationalError) ↵Lei Yan
(1054, "Unknown column 'mouse' in 'where clause'") [SQL: '\n select Geno)
2016-11-08READMEPjotr Prins
2016-11-08Merge pull request #232 from DannyArends/testingPjotr Prins
Updates to the CTL analysis
2016-11-08Adding the joss badgeDannyArends
2016-11-08Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingDannyArends
2016-11-07Adding functions addNode and addEdge, to separate out the cytoscape graph ↵DannyArends
creation from the main CTL analysis code
2016-11-07Adding the reference to the paper, and updating the output to show the ↵DannyArends
cytoscape.js network
2016-11-07Adding code to the ctl analysis file to output nodes and edges for cytoscapeDannyArends
2016-11-07Javascript file (based on the correlation file) to dsplay CTL networks using ↵DannyArends
cytoscape.js
2016-11-03Updated to use gn-deployPjotr Prins
2016-11-02Fixing docsPjotr Prins
2016-10-31Merge branch 'lyan' into testingPjotr Prins
2016-10-31Use existing GENODIR - the metadata can be stored there, next to thePjotr Prins
.geno files.
2016-10-31Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingPjotr Prins
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/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
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-27 18:01:21 +0000