aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-07Fixed things with the dataset dropdowns and mRNA datasets...Improved the templates for a couple pages related to changing user password, etc Zachary Sloan
2013-08-02Fixed a bug related to groups with genofiles (not sure if it makes sense...for them not to have genofiles yet) Zachary Sloan
2013-07-30Just added some print statements to debug an issue with LMM code...Also added some to notes Zachary Sloan
2013-07-23Fixed a couple issues with he quick_search_table.py script...Added notes on using percona to optimise mysql to gn_installation_notes.txt Started moving "get_trait_data" to DataSet since it is the same regardless of the particular DataSet subclass (PhenotypeDataSet, MrnaAssayDataSet, etc) Zachary Sloan
2013-07-19Finished integrating code that reads sample list from geno files...withouot using reaper and caches results so it doesn't need to read the file every single time someone loads a page Zachary Sloan
2013-07-19Created file gen_group_samplelists that iterates through all genofiles...and builds each groups' samplelist Zachary Sloan
2013-07-18Added Amelie's rat data genotypes...Got human mapping mostly working Fixed dataset dropdown menus Zachary Sloan
2013-07-18Merge branch 'master' of https://github.com/zsloan/genenetwork...Conflicts: wqflask/base/webqtlConfigLocal.py wqflask/maintenance/gen_select_dataset.py wqflask/wqflask/static/new/javascript/dataset_menu_structure.json Zachary Sloan
2013-07-18Added to installation notes...Removed webqtlConfigLocal file containing passwords Updated main page dropdown menus (dataset_menu_structure.json) Zachary Sloan
2013-07-17Fixed gen_select_dataset.py...Appended redis installation info to notes Zachary Sloan
2013-07-16Merge branch 'master' of https://github.com/zsloan/genenetwork...Conflicts: misc/gn_installation_notes.txt Zachary Sloan
2013-07-16Wrote code that can get a dataset's type for every single GN...dataset; previously we could not view traits in datasets that were not in the DBType table in the database Zachary Sloan
2013-07-10Updated installation notesroot
2013-07-10Updated gn_installation_notesZachary Sloan
2013-07-09Committing installation notes before editing them moreZachary Sloan
2013-07-03Updated requirements.txtZachary Sloan
2013-07-03Updated notes and created requirements.txt fileZachary Sloan
2013-07-03Made the table in the group manager sortable, etcZachary Sloan
2013-06-27Created a group manager page where user administrators can create...groups of datasets to give/add read privileges to Zachary Sloan
2013-06-26Merge /home/sam/geneZachary Sloan
2013-06-26More signin changesSam
2013-06-26Moved code creating DataSets object to a function in dataset.py...Added caching to creating DataSets object Zachary Sloan
2013-06-26Got code that creates DataSets object running...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 Zachary Sloan
2013-06-25Added DataSets class to dataset.py that will be used to create list of...confidential datasets Zachary Sloan
2013-06-21Added a thank you for siging in message...Fixed issues where homepage was reloaded in modal after siging in Sam
2013-06-21Merge /home/zas1024/geneSam
2013-06-21Working on getting logins working againSam
2013-06-21Fixed bug where cursor was still being used in queryZachary Sloan
2013-06-20Removed foobar from top of notes.txtZachary Sloan
2013-06-20Added fubar to the top of notes.txtZachary Sloan
2013-06-20Merge branch 'flask' of /home/sam/gene...Conflicts: wqflask/wqflask/templates/index_page.html Zachary Sloan
2013-06-20Merge branch 'flask'Zachary Sloan
2013-06-20Committing before pulling from flask branchZachary Sloan
2013-06-20Added explanation of pushing to github to notesZachary Sloan
2013-06-20Added file corr_result_helpers.py that includes the function that...normalizes the lists of sample values Zachary Sloan
2013-06-20Fixed conflict of mergeSam
2013-06-20Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask...Conflicts: wqflask/requirements.txt wqflask/wqflask/correlation/show_corr_results.py Zachary Sloan
2013-06-20Copied over Lei's correlation code from after he pushed yesterdayZachary Sloan
2013-06-19Added nginx_conf directory to git trackingLei Yan
2013-06-19Fixed issue where the Mean Expr, Max LRS, and Max LRS Location columns...in the correlation page weren't displaying Lei Yan
2013-06-19Merge branch 'flask' of git://github.com/zsloan/genenetwork into flask...Conflicts: wqflask/base/data_set.py Lei Yan
2013-06-19:Merge git://github.com/zsloan/genenetwork into flask...Conflicts: wqflask/requirements.txt Lei Yan
2013-06-19Changed QTL parameter name to "get_qtl_info" on trait.py and...other places it's called, like search_results.py Added other trait info fields to correlation results page Lei Yan
2013-06-19When I pulled Sam's code the search page was changed from GET to...POST in views.py, so I had to change it back Zachary Sloan
2013-06-19Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask...Conflicts: wqflask/base/data_set.py wqflask/wqflask/views.py Fixed a couple conflicts to merge Lei's code related to the correlation page Zachary Sloan
2013-06-14Merge git://github.com/leiyan/GeneNetwork2-Python into flask...Conflicts: wqflask/requirements.txt Made small change for merge with Lei's branch Zachary Sloan
2013-06-13Made a few changes while trying to figure out why the search isn't working...post-merging with Sam's code Zachary Sloan
2013-06-13Merge /home/sam/gene into flask...Conflicts: wqflask/wqflask/templates/index_page.html Merging the code on Sam's branch onto my own Zachary Sloan
2013-06-13Fixed issue where too much memory was used as a result of creating a...dataset object for each trait in the correlation results Added new fields/columns for each trait in the correlation result table (max LRS, max LRS location, mean expression) Fixed error if trait doesn't have these fields Lei Yan
2013-06-13Put the template html for the quick search page when all trait types...are displayed in a separate file that is included in quick_search.html Zachary Sloan