aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2013-05-23Changed the way the query that gets sample ids is generatedLei Yan
2013-05-23Now calculates correlation values for traits, but not yet in templateLei Yan
2013-05-23Added a templateSam
2013-05-23Lots of changes around usersSam
2013-05-21Added caching to the search page (for both regular and quick searckes)Zachary Sloan
2013-05-17Did a little work with quick search pageZachary Sloan
2013-05-17Simplification of modal codeSam
Created css file to hold modal padding
2013-05-17Modal windows now working betterSam
Going to simplify the code next
2013-05-17Added flask_security locallySam
2013-05-17More working on security templatesSam
2013-05-16Switching between login and register working pretty wellSam
2013-05-16Made the first level of quick search tabs species, followed byZachary Sloan
trait type (was the opposite before Rob commented on it earlier today)
2013-05-16Before trying a new modal windowSam
2013-05-10Sign in template looking even betterSam
2013-05-10Sign in template looking pretty goodSam
2013-05-10More security changesSam
2013-05-10Have the beginnings of a user_manager workingSam
2013-05-09Just added some print statements so I can show matrix/vectorZachary Sloan
shapes to Tony
2013-05-09Added original security templates (so we can change them)Sam
2013-05-09Working on user registrationSam
2013-05-08Merge branch 'flask' of git://github.com/leiyan/genenetwork into flaskZachary Sloan
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-05-07Made some progress adding species/group tabs to the quick search result page toZachary Sloan
make the results easier to navigate
2013-05-02Got quick search code running (but not displaying properly)Zachary Sloan
Code that processes subset of snps works, in process of putting into a class
2013-04-30Merge branch 'flask' of git://github.com/leiyan/genenetwork into flaskZachary Sloan