aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-09Added config fileZachary Sloan
2014-10-09Fixed error with loading the trait page for phenotype traitsZachary Sloan
2014-10-02Fixed an error when there's no locus for mRNA expression traitsZachary Sloan
2014-09-29Found the problem that was causing several collections functions to not workZachary Sloan
and fixed it
2014-09-22Adding the port as a parameter to runserver; this should just be temporary untilZachary Sloan
I figure out how to get it to read the port from the config file instead Using runserver.py instead of secure_server.py because of an error with the latter that I haven't figured out how to fix yet Improved the appearance of several of the tables
2014-08-28Added a validation that warns the user of the number of permutations forZachary Sloan
pyLMM is more than 20 (due to speed) Changed the port in the flask settings to 5002 due to adding the new production server branch
2014-08-25Merge /home/lei/geneZachary Sloan
2014-08-25Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2014-08-25Merge /home/lei/geneZachary Sloan
2014-08-25Added permutations to pyLMMZachary Sloan
2014-08-21Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2014-08-21Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2014-08-21Added the option to display mapping results as either an interval mappingZachary Sloan
or manhattan plot Fixed a few minor bugs
2014-08-15Permutations now work with rqtlZachary Sloan
2014-08-12Fixed the scrollable data tables for the show trait pageZachary Sloan
Added the option to display the rqtl results (and soon other mapping results) as either a manhattan plot or "interval map" style curve chart Removed a couple unnecessary javascript imports Changed the function in helper_functions.py that creates the trait and dataset objects, making it to where the trait object also gets qtl info Fixed color by trait after it was broken by the "scatterplot matrix" function
2014-08-04Fixed another minor issue with the heatmap where the original curve wouldn't ↵Zachary Sloan
be removed
2014-08-04Fixed a problem with the heatmap after moving reorgLodData function to ↵Zachary Sloan
panelutils.js Got rqtl working with converted BXD genofile and also got composite mapping working
2014-07-25Got the heatmap/lodchart combo workingZachary Sloan
Started working on getting rqtl working as another mapping method
2014-07-21Fixed issue where sample values were ordered on the trait pageZachary Sloan
2014-07-21Heatmap is now working (using Karl's qtlcharts code), but still needZachary Sloan
to figure out the issue with the color range
2014-07-21Merge /home/lei/geneZachary Sloan
2014-07-18Forgot to add the heatmap __init__.py file in the last commitZachary Sloan
2014-07-18Just did some more work on the heatmapZachary Sloan
2014-07-18Merge /home/zas1024/geneLei Yan
Conflicts: wqflask/base/data_set.py
2014-07-18Added outlier highlightingZachary Sloan
Changed order of tabs in statistics panel on trait page Started working on heatmap
2014-07-18Correlation table for phenotypes is workingLei Yan
2014-07-14TestLei Yan
2014-07-14Merge /home/zas1024/geneLei Yan
Conflicts: wqflask/wqflask/static/new/javascript/dataset_select_menu.js wqflask/wqflask/templates/corr_scatter_plot_old.html
2014-07-14Test againZachary Sloan
2014-07-14Testing commit of HSNIH_copy.genoZachary Sloan
2014-07-14Made interval map zoom look betterZachary Sloan
Started creating probability plot for show trait page Added outlier detection message when user does mapping
2014-07-09Updated coffeescript, svg export working fine, interval mapping zoom workingZachary Sloan
2014-06-25Added Karl's correlation matrix codeZachary Sloan
Improved the "scatterplot matrix" feature on the trait page so that it matches the chosen trait against every selected trait
2014-06-12Long overdue of commit to changes that add a scatter plot to the correlation ↵Zachary Sloan
page and let you select a trait from your collection on the trait page and do a scatter plot against that triat as well. There are a number of accompanying js and css files written by Karl Broman that are needed for these features. The option to compare against more than just one trait still needs to be added for the trait page scatterplot function
2014-06-06Implimented Karl Broman's lodchart code for the interval mapping function.Zachary Sloan
Suggestive/significant bars and additive effect curve added
2014-05-19Fixed sorting on the show trait pageZachary Sloan
Added/improved the x and y axis on the bar graph and histogram GEMMA working but still really slow
2014-05-05Committing a bunch of changes related to integrating GEMMA andZachary Sloan
adding the correlation matrix page
2014-03-26Got anonymous collections working correctlyZachary Sloan
Got results for the HSNIH and CANDLE marker regression pages (still some issues with the manhattan plot)
2014-03-05Improved load_genotypes.pyLei Yan
Committer: Lei Yan <lei@penguin.uthsc.edu> On branch master
2014-02-28Committing after creating AnonCollection class and before addingZachary Sloan
remove trait function
2014-02-28Made some changes/comments to Lei's load_genotypes.py fileZachary Sloan
2014-02-28Made some changes to Lei's IO code for GN1 and GN2 genofilesLei Yan
2014-02-27Began working on a TraitCollection.py file that will contain both theZachary Sloan
object for logged in user collections and collections created by anonymous users.
2014-02-26Collection page now displays for temp/anon collections, butZachary Sloan
still needs the option to remove traits from them
2014-02-25Made some more progress towards getting anonymous collections workingZachary Sloan
2014-02-25Committing part-way through getting anonymous collections workingZachary Sloan
2014-02-25Merge /home/sam/geneZachary Sloan
2014-02-25Added untracked fileSam
2014-02-25Just committing after messing with the marker regression plotZachary Sloan
2014-02-24Chromosome zoom is working for the marker regression manhattan plotZachary Sloan
and results show up correctly in the table again