aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-11Some more notesDannyArends
2015-09-11Adding a custom wgcna route in gn2, and adding a button to the ↵DannyArends
collections/view.html
2015-09-11Comment out some excessive stdout spamDannyArends
2015-09-11Notes while integrating WCGNADannyArends
2015-09-11Adding an empty HTML results template for WCGNADannyArends
2015-09-10Merge pull request #117 from lyan6/masterzsloan
Fixed "TypeError: float argument required, not NoneType" about mean.
2015-09-10Fixed "TypeError: float argument required, not NoneType" about mean.Lei Yan
Committer: Lei Yan <lei@penguin.uthsc.edu> On branch master
2015-09-09Merge pull request #114 from DannyArends/masterzsloan
This should fix issue #113
2015-09-09Issue genenetwork/genenetwork2#113, forgot to uncomment the secret_keyDannyArends
2015-09-09Fix for issue genenetwork/genenetwork2#113, I added the SESSION_TYPE and ↵DannyArends
SECRET_KEY to the default config, this should be overwritten in my_settings.py
2015-09-08Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-09-08Fixed covariates with R/qtl mappingzsloan
A few minor GUI changes on trait page (button names, locations, etc) Fixed "pressing enter to search" on index page
2015-09-08Merge pull request #112 from DannyArends/masterzsloan
The misc/requirements.txt should not break the Docker build
2015-09-07The misc/requirements.txt does not break the Docker build anymoreDannyArends
2015-09-01Fixed issue that caused R/qtl mapping to not workzsloan
Removed bootstrap and additive effect options until I can get them working correctly
2015-09-01Fixed color by trait featurezsloan
Added Y axis line to bar histogram Added link to GN1 in menu bar Fixed mapping results table to look more like other tables (though still has initial issue with header being too short) Added Tissue to global search results and trait page
2015-08-26Fixed issue with colums for the gene global search (still need to change for ↵zsloan
phenotype) Fixed issue where LRS and LOD are sometimes labeled incorrectly Changed the header of the trait page Added link to GN1 in header Fixxed an issue that made permutations not work with pylmm Fixed "sign in" button when creating a collection while not logged in
2015-08-14Added csv download button to search result table; still need to add to otherzsloan
tables and later attach its functionality to the existing Download Table button Fixed an issue where rows wouldn't uncheck with backspacing in Select Top text area; the last commit just fixed the highlighting, not the checkboxes Some changes in progress towards trying to fix the additive effect issue; the problem is that the lod_chart.js code writes each chromosome as one d3 path, so I can't change the color for individual segments within that path. I'll have to completely change the way the path is drawn for the additive effect
2015-08-12Made Select Top function more intuitively and changed the text box lengthzsloan
2015-08-12Fixed global and regular search so that resizing/reordering columns works ↵zsloan
for all of them, among other minor changes
2015-08-11Highlighting works for all trait selection options (select all, invert, ↵zsloan
select top) Search table and Select Top options added to global and regular search pages
2015-08-06Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-08-06Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-08-06Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-08-04Fixed additive effect for lodchartzsloan
Made some more changes/improvements to various tables throughout the site
2015-07-31Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-07-29Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-07-28Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-07-27Committing a few more changes to tables before pulling Lei's global search ↵zsloan
updates
2015-07-24Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-07-23Merge /home/zas1024/geneLei Yan
2015-07-23Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-07-23Committing most recent changes to tables so Lei can pull; still have a few ↵zsloan
more issues to resolve, like setting initial column width
2015-07-20Missed commenting out a line in collections/listzsloan
2015-07-20Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2015-07-20Fixed the code that generates the dataset selection drop-down for correlationszsloan
Made changes to the tables of correlation results, collections, and search results: - Added resizeable columns to correlation results and collections, but not to search results because it seems that it requires Y scrolling to be set (I'll check if it makes sense to add scrolling to the search results) - Correlation results and collections are now in scrolling tables - The style is the same across all of these tables now Remaining issues: - It doesn't seem like I can set the column width when initializing dataTables in correlation results. I don't know why this is; it might be due to the table already being the size of a full page. I want to be able to default to some good widths, even if the user can resize them - I tried adding hoverForMore, but it doesn't seem to cooperate with datatable cells; I think this is due to having to put the text in a div.
2015-07-17Merge pull request #97 from lyan6/masterzsloan
Committer: Lei Yan <lei@penguin.uthsc.edu>
2015-07-17Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-07-16Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
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
Conflicts: wqflask/wqflask/templates/search_result_page.html
2015-07-15Cursor doesn't change when hovering over index column header nowzsloan
2015-07-15Merge pull request #94 from lyan6/masterzsloan
Committer: Lei Yan <lei@penguin.uthsc.edu>
2015-07-15Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2015-07-10Merge /home/lei/genezsloan
2015-07-10Fixed the genofile_parser.py script since some .geno files had been ↵zsloan
incorrectly converted to json Fixed GO search to work with combined searches
2015-07-10Merge https://github.com/genenetwork/genenetwork2Lei Yan
2015-07-10On branch masterLei Yan