| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-07-20 | Missed commenting out a line in collections/list | zsloan | |
| 2015-07-20 | Merge branch 'master' of github.com:genenetwork/genenetwork2 | zsloan | |
| 2015-07-20 | Fixed the code that generates the dataset selection drop-down for correlations | zsloan | |
| 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-17 | Merge https://github.com/genenetwork/genenetwork2 | Lei Yan | |
| 2015-07-16 | Committer: Lei Yan <lei@penguin.uthsc.edu> | Lei Yan | |
| On branch master | |||
| 2015-07-15 | Fixed issue where chromosome view doesn't work on qtlreaper mapping results | zsloan | |
| 2015-07-15 | Fixed some of the javascript after pulling Lei's changes to the search table | zsloan | |
| 2015-07-15 | Small mistake during last merge; forgot to change if to elif in template | zsloan | |
| 2015-07-15 | Merge branch 'master' of github.com:genenetwork/genenetwork2 | zsloan | |
| Conflicts: wqflask/wqflask/templates/search_result_page.html | |||
| 2015-07-15 | Cursor doesn't change when hovering over index column header now | zsloan | |
| 2015-07-15 | Committer: Lei Yan <lei@penguin.uthsc.edu> | Lei Yan | |
| On branch master | |||
| 2015-07-10 | Merge /home/lei/gene | zsloan | |
| 2015-07-10 | Fixed 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-10 | Merge https://github.com/genenetwork/genenetwork2 | Lei Yan | |
| 2015-07-10 | On branch master | Lei Yan | |
| 2015-07-10 | Added an OR ("Get Any") search to the index page | zsloan | |
| Fixed several issues with existing searches; for example, the user can type "Chr" before the chromosome parameter (for example LRS=(9 999 Chr2 100 105) ) | |||
| 2015-07-09 | Added a temporary fix to prevent .geno requiring mapping methods from ↵ | zsloan | |
| appearing for human groups | |||
| 2015-07-09 | Forgot to add one change to the last commit | zsloan | |
| 2015-07-09 | Mapping methods now check for existing genotype files. | zsloan | |
| Currently we still usually get our samplelists from the genofile. This is dumb because it results in us having a bunch of "dummy" genofiles for certain data sets (seems to be mostly human ones). This means that checking for the genofile alone isn't enough to determine if a mapping method should exist for a given group I wrote some code that will instead get the samplelist from the plink .fam file for some of these groups/datasets (if the .fam file exists). Ideally I would like to remove all of the dummy .geno files, but we can't yet do so because it's currently the only place we seem to be storing the sample list for some groups. I also moved gemma into the plink directory to get it out of the git tree. Since it uses the same files as plink, it doesn't make sense for it to be in its own separate directory | |||
| 2015-07-09 | Some phenotype searches were throwing an error due to an assert statement in ↵ | zsloan | |
| trait.py. Since I couldn't find the purpose of the assert statement I removed it. | |||
| 2015-07-07 | Updated mirror/development sites and changed font color in form control emements | zsloan | |
| 2015-07-07 | Also added index column to collections | zsloan | |
| 2015-07-07 | Added index column and changed the way location is displayed for search results | zsloan | |
| 2015-07-06 | Forgot to add the search error page template | zsloan | |
| 2015-07-06 | An error page should be loaded if the user uses a nonexistent search term, ↵ | zsloan | |
| instead of getting an Internal Server Error | |||
| 2015-07-02 | Merge branch 'master' of github.com:genenetwork/genenetwork2 | zsloan | |
| 2015-07-02 | Combined searches that didn't work previously should work now, including cis ↵ | zsloan | |
| and trans combined searches | |||
| 2015-07-02 | fix typos | Artem Tarasov | |
| 2015-07-02 | fix #80 | Artem Tarasov | |
| 2015-07-02 | use button for returning to full view | Artem Tarasov | |
| 2015-07-01 | Needed to add a couple parenthesis for transLRS searches | zsloan | |
| 2015-07-01 | Merge branch 'master' of github.com:genenetwork/genenetwork2 | zsloan | |
| 2015-07-01 | cis and trans LRS searches now work. Still need to get them working in ↵ | zsloan | |
| combined searches | |||
| 2015-06-29 | Merge pull request #72 from lomereiter/issue69 | zsloan | |
| Fixes #69 | |||
| 2015-06-29 | Merge pull request #77 from lomereiter/fix_sql | zsloan | |
| SQL security fixes | |||
| 2015-06-26 | Fixed minor bug where the static loading bar would remain after the mapping ↵ | zsloan | |
| results were displayed. | |||
| 2015-06-26 | Fixed bug where mapping results sometimes wouldn't display. This would occur | zsloan | |
| due to a chromosome (in this case the last) not having any markers. Improved the way plink gets its path/command to use a method similar to the one Pjotr used with pylmm. I'll also do this for the other mapping methods. Fixed issue where the Y axis would always say LOD score. It now says LRS for mapping methods that return LRS Switched interval mapping (qtl reaper) to use the marker_regression template and removed the interval_mapping template (since it's unnecessary) Some commented out changes remain (in show_trait_mapping_tools and create_lodchart) from when I was attempting to open the mapping results in a new page. I had resolved every issue but the mapping javascript (lod_chart) not being able to access js_data (which has all the result data; markers, p-values, etc). I'm pretty sure that this is because js_data was inserted into the html after the page was loaded while the chart code ran immediately. I experimented with adding a short timeout to the mapping javascript and data table javascript, but while it worked for the table it did not work for the mapping figure. I don't know why this is. | |||
| 2015-06-22 | Merge branch 'master' of github.com:genenetwork/genenetwork2 | zsloan | |
| Conflicts: wqflask/wqflask/templates/marker_regression.html | |||
| 2015-06-22 | Just a few minor changes before pulling Artem's fix to the mapping issue. | zsloan | |
| 2015-06-22 | Merge pull request #75 from lomereiter/fix_search | zsloan | |
| fix genotype search | |||
| 2015-06-22 | escape docs query | Artem Tarasov | |
| 2015-06-22 | fixed a few potential security issues | Artem Tarasov | |
| 2015-06-21 | fix mapping results loading | Artem Tarasov | |
| 2015-06-20 | fix genotype search | Artem Tarasov | |
| 2015-06-18 | Fixed issue that prevented multiple mapping submissions without refreshing. ↵ | zsloan | |
| Also changed to where results open in new window instead of colorbox, though an issue remains where the css doesn't seem to be getting imported properly. | |||
| 2015-06-18 | removed unused function | Artem Tarasov | |
| 2015-06-18 | fix all_samples_ordered | Artem Tarasov | |
| move duplicated code into a method, handle the case of missing f1/f12 correctly | |||
| 2015-06-18 | add missing line to webqtlUtil | Artem Tarasov | |
| 2015-06-17 | Now you can expand/contract tabs on the trait page by click anywhere on the bar | zsloan | |
| 2015-06-16 | Finished adding all the extra tools/links below the trait details | zsloan | |
 |
index : genenetwork2 | |
| GeneNetwork (2nd generation) |
| aboutsummaryrefslogtreecommitdiff |