aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-18Merge branch 'master' of https://github.com/zsloan/genenetworkZachary Sloan
Conflicts: wqflask/base/webqtlConfigLocal.py wqflask/maintenance/gen_select_dataset.py wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
2013-07-18Added to installation notesZachary Sloan
Removed webqtlConfigLocal file containing passwords Updated main page dropdown menus (dataset_menu_structure.json)
2013-07-17Fixed gen_select_dataset.pyZachary Sloan
Appended redis installation info to notes
2013-07-16Merge branch 'master' of https://github.com/zsloan/genenetworkZachary Sloan
Conflicts: misc/gn_installation_notes.txt
2013-07-16Wrote code that can get a dataset's type for every single GNZachary Sloan
dataset; previously we could not view traits in datasets that were not in the DBType table in the database
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 createZachary Sloan
groups of datasets to give/add read privileges to
2013-06-26Merge /home/sam/geneZachary Sloan
2013-06-26More signin changesSam
2013-06-26Moved code creating DataSets object to a function in dataset.pyZachary Sloan
Added caching to creating DataSets object
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-06-25Added DataSets class to dataset.py that will be used to create list ofZachary Sloan
confidential datasets
2013-06-21Added a thank you for siging in messageSam
Fixed issues where homepage was reloaded in modal after siging in
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/geneZachary Sloan
Conflicts: wqflask/wqflask/templates/index_page.html
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 thatZachary Sloan
normalizes the lists of sample values
2013-06-20Fixed conflict of mergeSam
2013-06-20Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flaskZachary Sloan
Conflicts: wqflask/requirements.txt wqflask/wqflask/correlation/show_corr_results.py
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 columnsLei Yan
in the correlation page weren't displaying
2013-06-19Merge branch 'flask' of git://github.com/zsloan/genenetwork into flaskLei Yan
Conflicts: wqflask/base/data_set.py
2013-06-19:Merge git://github.com/zsloan/genenetwork into flaskLei Yan
Conflicts: wqflask/requirements.txt
2013-06-19Changed QTL parameter name to "get_qtl_info" on trait.py andLei Yan
other places it's called, like search_results.py Added other trait info fields to correlation results page
2013-06-19When I pulled Sam's code the search page was changed from GET toZachary Sloan
POST in views.py, so I had to change it back
2013-06-19Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flaskZachary Sloan
Conflicts: wqflask/base/data_set.py wqflask/wqflask/views.py Fixed a couple conflicts to merge Lei's code related to the correlation page
2013-06-14Merge git://github.com/leiyan/GeneNetwork2-Python into flaskZachary Sloan
Conflicts: wqflask/requirements.txt Made small change for merge with Lei's branch
2013-06-13Made a few changes while trying to figure out why the search isn't workingZachary Sloan
post-merging with Sam's code
2013-06-13Merge /home/sam/gene into flaskZachary Sloan
Conflicts: wqflask/wqflask/templates/index_page.html Merging the code on Sam's branch onto my own
2013-06-13Fixed issue where too much memory was used as a result of creating aLei Yan
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
2013-06-13Put the template html for the quick search page when all trait typesZachary Sloan
are displayed in a separate file that is included in quick_search.html
2013-06-13Small changesSam
2013-06-12Fixed a couple issues with the template that caused theZachary Sloan
regular search results and show trait page to not display
2013-06-11Put trait info for correlation results page into a dictionary insteadLei Yan
of storing list of GeneralTrait objects Added print statements to track memory usage
2013-05-31Fixed the location column for the quick search pageZachary Sloan
Began writing some jquery to automatically open the first tab within each species tab on the quick search page (not done yet)
2013-05-30Rewrote some code in get_trait_info in dataset.pyLei Yan
Added spearman correlation to show_corr_results and template
2013-05-28Have correlation values appearing in a table in the templateLei Yan
Use scipy to calculate pearson correlation instead of old GN code
2013-05-23Worked on rewriting the function in data_set.py that gets the sampleLei Yan
values for each trait