aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-07-17Merge pull request #97 from lyan6/masterzsloan
2015-07-17Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-07-16Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
2015-07-15Fixed issue where chromosome view doesn't work on qtlreaper mapping resultszsloan
2015-07-15Fixed some of the javascript after pulling Lei's changes to the search tablezsloan
2015-07-15Small mistake during last merge; forgot to change if to elif in templatezsloan
2015-07-15Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-07-15Cursor doesn't change when hovering over index column header nowzsloan
2015-07-15Merge pull request #94 from lyan6/masterzsloan
2015-07-15Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
2015-07-10Merge /home/lei/genezsloan
2015-07-10Fixed the genofile_parser.py script since some .geno files had been incorrect...zsloan
2015-07-10Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-07-10On branch masterLei Yan
2015-07-10On branch masterLei Yan
2015-07-10Added an OR ("Get Any") search to the index pagezsloan
2015-07-09Added a temporary fix to prevent .geno requiring mapping methods from appeari...zsloan
2015-07-09Forgot to add one change to the last commitzsloan
2015-07-09Mapping methods now check for existing genotype files.zsloan
2015-07-09Some phenotype searches were throwing an error due to an assert statement in ...zsloan
2015-07-07Updated mirror/development sites and changed font color in form control emementszsloan
2015-07-07Also added index column to collectionszsloan
2015-07-07Added index column and changed the way location is displayed for search resultszsloan
2015-07-06Forgot to add the search error page templatezsloan
2015-07-06An error page should be loaded if the user uses a nonexistent search term, in...zsloan
2015-07-02Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-07-02Merge pull request #81 from lomereiter/fix_exportingzsloan
2015-07-02Combined searches that didn't work previously should work now, including cis ...zsloan
2015-07-02fix typosArtem Tarasov
2015-07-02fix #80Artem Tarasov
2015-07-02use button for returning to full viewArtem Tarasov
2015-07-02added CairoSVG to misc/requirementsArtem Tarasov
2015-07-01Needed to add a couple parenthesis for transLRS searcheszsloan
2015-07-01Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-07-01cis and trans LRS searches now work. Still need to get them working in combin...zsloan
2015-06-29Merge pull request #72 from lomereiter/issue69zsloan
2015-06-29Merge pull request #77 from lomereiter/fix_sqlzsloan
2015-06-26Fixed minor bug where the static loading bar would remain after the mapping r...zsloan
2015-06-26Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-06-26Fixed bug where mapping results sometimes wouldn't display. This would occurzsloan
2015-06-26Added license filepjotrp
2015-06-22Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-06-22Just a few minor changes before pulling Artem's fix to the mapping issue.zsloan
2015-06-22Merge pull request #75 from lomereiter/fix_searchzsloan
2015-06-22Merge pull request #76 from lomereiter/fix_mapping_resultszsloan
2015-06-22escape docs queryArtem Tarasov
2015-06-22fixed a few potential security issuesArtem Tarasov
2015-06-21fix mapping results loadingArtem Tarasov
2015-06-20fix genotype searchArtem Tarasov
2015-06-18Fixed issue that prevented multiple mapping submissions without refreshing. A...zsloan