aboutsummaryrefslogtreecommitdiff
path: root/web
AgeCommit message (Collapse)Author
2015-04-06Added secure_server.py to gitignore and fixed conflicts for merging Lei's ↵zsloan
new code
2015-03-27Removed everything from 'web' directory except genofiles and renamed the ↵zsloan
directory to 'genotype_files'
2015-03-18Fixed the borky genofilezsloan
2015-03-17Added r function for setting genotypes and generating the cross filezsloan
2014-12-18Committer: Lei Yan <lei@penguin.uthsc.edu>Lei Yan
On branch master
2014-11-17Just more changes converting to bootstrap 3Zachary Sloan
2014-11-06Upgraded to bootstrap 3 and updated a lot of html to reflect thisZachary 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-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
2013-10-11Merge /home/lei/geneZachary Sloan
Conflicts: wqflask/maintenance/quick_search_table.py
2013-09-27Added trait links to correlation resultsLei Yan
Began adding the code that does the initial sort by literature correlation
2013-09-24Just committing a few additions to the interval mapping codeZachary Sloan
2013-08-14Made some changes related to getting marker regression working forZachary Sloan
some datasets
2013-07-19Created file gen_group_samplelists that iterates through all genofilesZachary Sloan
and builds each groups' samplelist
2013-07-18Added Amelie's rat data genotypesZachary Sloan
Got human mapping mostly working Fixed dataset dropdown menus
2013-06-26Got code that creates DataSets object runningZachary Sloan
Fixed one genofile that had extra quotation marks in the comments that caused an error Defaults mb_graph_interval to 1 for species without chromosome lengths in megabases
2013-05-08Worked on correlation pageLei Yan
Wrote function in dataset.py that gets all the traits in a dataset and their sample values
2013-02-21Adding genotypes and new_genotypes (json files) directories to gitZachary Sloan
so they can be pulled to the new EC2 server
2012-11-27Created subclass for each main data set type and moved the codeZachary Sloan
for getting trait info that was in search_results.py into its respective class Renamed webqtlDataset to DataSet/create_dataset in webqtlTrait.py, webqtlDatabaseFunction.py, and CorrelationPage.py Got search page running again for mRNA assay data sets with these changes
2012-11-02Created search objects for GeneRIF and GeneWiki searchesZachary Sloan
Got search results to display Refactored the template for show_trait page
2012-10-25Worked on search page code; got to the part that actually does the searchZachary Sloan
Renamed RISet and cross to "group" throughout webqtlDataset.py and search_results.py
2012-10-19Reindented genSelectDatasetJS as gen_select_datasetZachary Sloan
2012-10-18Converted selectDatasetMenu.js code to coffeescript as ↵Zachary Sloan
dataset_select_menu.coffee Copied the menu variables from selectDatasetMenu.js as dataset_select_items.js
2012-10-03Changed css classes used in trait data table and wrote coffeescript code thatZachary Sloan
grabs the list of samples with an attribute value matching the value the user chose to exclude by. Added HTML5 data properties to table cells as data-column_name to use when excluding samples.
2012-10-02Renamed trait_data_and_analysis.html to show_trait.html, DataEditingPage.py ↵Zachary Sloan
to show_trait.py, and trait_data_and_analysis.coffee to show_trait.coffee
2012-08-23Various minor changesZachary Sloan
2012-06-25Modified cssSam Ockman
2012-06-25Creating a new css file for use with flaskSam Ockman
2012-06-02Merge and file additionsSam Ockman
2012-06-01added scrollable tab areas for the updated basic statistics outputroot
2012-06-01Views and templates modified to allow template analysisSam Ockman
2012-05-31 On branch developroot
Changes to be committed: modified: web/javascript/jqueryFunction.js modified: web/webqtl/correlation/CorrelationPage.py modified: web/webqtl/showTrait/DataEditingPage.py
2012-05-30Merge branch 'master' of https://github.com/zsloan/genenetwork into flaskSam Ockman
2012-05-23 On branch masterroot
Changes to be committed: modified: web/dbdoc/G2NEI_ILM_Retina_BXD_RI0410.html modified: web/dbdoc/ONCRetILM6_0412.html modified: web/javascript/selectDatasetMenu.js
2012-05-23Update web/webqtl/correlation/CorrelationPage.pyzsloan
2012-05-23Update web/webqtl/correlation/CorrelationPage.pyzsloan
2012-05-22 On branch masterroot
Changes to be committed: modified: web/webqtl/.htaccess modified: web/webqtl/base/webqtlConfigLocal.py
2012-05-22 On branch masterLei Yan
Changes to be committed: deleted: web/image/test deleted: web/tmp/test
2012-05-22 On branch masterLei Yan
Changes to be committed: new file: web/image/test new file: web/tmp/test
2012-05-22Merge branch 'master' of github.com:genenetwork/genenetworkLei Yan
2012-05-22 On branch masterroot
Your branch is ahead of 'origin/master' by 2 commits. Changes to be committed: (use "git reset HEAD <file>..." to unstage) deleted: web/webqtl/pubmedsearch/PubmedSearch.py deleted: web/webqtl/pubmedsearch/PubmedSearchRe.py deleted: web/webqtl/pubmedsearch/__init__.py deleted: web/webqtl/search/pubmedsearch.py
2012-05-22Latest version of GN source codesroot
2012-05-22Latest version of GN source codesroot
2012-05-09Update web/javascript/networkGraph.jsGeneNetwork
2012-05-09Update web/javascript/networkGraph.jsGeneNetwork
2012-05-09Update web/javascript/networkGraph.jsGeneNetwork
2012-05-08Add all the source codes into the github.root
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-24 17:31:30 +0000