| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-06-21 | Working on getting logins working again | Sam | |
| 2013-06-20 | Added fubar to the top of notes.txt | Zachary Sloan | |
| 2013-06-20 | Merge branch 'flask' of /home/sam/gene | Zachary Sloan | |
| Conflicts: wqflask/wqflask/templates/index_page.html | |||
| 2013-06-20 | Merge branch 'flask' | Zachary Sloan | |
| 2013-06-20 | Committing before pulling from flask branch | Zachary Sloan | |
| 2013-06-20 | Added explanation of pushing to github to notes | Zachary Sloan | |
| 2013-06-20 | Added file corr_result_helpers.py that includes the function that | Zachary Sloan | |
| normalizes the lists of sample values | |||
| 2013-06-20 | Fixed conflict of merge | Sam | |
| 2013-06-20 | Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask | Zachary Sloan | |
| Conflicts: wqflask/requirements.txt wqflask/wqflask/correlation/show_corr_results.py | |||
| 2013-06-20 | Copied over Lei's correlation code from after he pushed yesterday | Zachary Sloan | |
| 2013-06-19 | Added nginx_conf directory to git tracking | Lei Yan | |
| 2013-06-19 | Fixed issue where the Mean Expr, Max LRS, and Max LRS Location columns | Lei Yan | |
| in the correlation page weren't displaying | |||
| 2013-06-19 | Merge branch 'flask' of git://github.com/zsloan/genenetwork into flask | Lei Yan | |
| Conflicts: wqflask/base/data_set.py | |||
| 2013-06-19 | :Merge git://github.com/zsloan/genenetwork into flask | Lei Yan | |
| Conflicts: wqflask/requirements.txt | |||
| 2013-06-19 | Changed QTL parameter name to "get_qtl_info" on trait.py and | Lei Yan | |
| other places it's called, like search_results.py Added other trait info fields to correlation results page | |||
| 2013-06-19 | When I pulled Sam's code the search page was changed from GET to | Zachary Sloan | |
| POST in views.py, so I had to change it back | |||
| 2013-06-19 | Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask | Zachary 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-14 | Merge git://github.com/leiyan/GeneNetwork2-Python into flask | Zachary Sloan | |
| Conflicts: wqflask/requirements.txt Made small change for merge with Lei's branch | |||
| 2013-06-13 | Made a few changes while trying to figure out why the search isn't working | Zachary Sloan | |
| post-merging with Sam's code | |||
| 2013-06-13 | Merge /home/sam/gene into flask | Zachary Sloan | |
| Conflicts: wqflask/wqflask/templates/index_page.html Merging the code on Sam's branch onto my own | |||
| 2013-06-13 | Fixed issue where too much memory was used as a result of creating a | Lei 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-13 | Put the template html for the quick search page when all trait types | Zachary Sloan | |
| are displayed in a separate file that is included in quick_search.html | |||
| 2013-06-13 | Small changes | Sam | |
| 2013-06-12 | Fixed a couple issues with the template that caused the | Zachary Sloan | |
| regular search results and show trait page to not display | |||
| 2013-06-11 | Put trait info for correlation results page into a dictionary instead | Lei Yan | |
| of storing list of GeneralTrait objects Added print statements to track memory usage | |||
| 2013-05-31 | Fixed the location column for the quick search page | Zachary 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-30 | Rewrote some code in get_trait_info in dataset.py | Lei Yan | |
| Added spearman correlation to show_corr_results and template | |||
| 2013-05-28 | Have correlation values appearing in a table in the template | Lei Yan | |
| Use scipy to calculate pearson correlation instead of old GN code | |||
| 2013-05-23 | Worked on rewriting the function in data_set.py that gets the sample | Lei Yan | |
| values for each trait | |||
| 2013-05-23 | Changed the way the query that gets sample ids is generated | Lei Yan | |
| 2013-05-23 | Now calculates correlation values for traits, but not yet in template | Lei Yan | |
| 2013-05-23 | Added a template | Sam | |
| 2013-05-23 | Lots of changes around users | Sam | |
| 2013-05-21 | Added caching to the search page (for both regular and quick searckes) | Zachary Sloan | |
| 2013-05-17 | Did a little work with quick search page | Zachary Sloan | |
| 2013-05-17 | Simplification of modal code | Sam | |
| Created css file to hold modal padding | |||
| 2013-05-17 | Modal windows now working better | Sam | |
| Going to simplify the code next | |||
| 2013-05-17 | Added flask_security locally | Sam | |
| 2013-05-17 | More working on security templates | Sam | |
| 2013-05-16 | Switching between login and register working pretty well | Sam | |
| 2013-05-16 | Made the first level of quick search tabs species, followed by | Zachary Sloan | |
| trait type (was the opposite before Rob commented on it earlier today) | |||
| 2013-05-16 | Before trying a new modal window | Sam | |
| 2013-05-10 | Sign in template looking even better | Sam | |
| 2013-05-10 | Sign in template looking pretty good | Sam | |
| 2013-05-10 | More security changes | Sam | |
| 2013-05-10 | Have the beginnings of a user_manager working | Sam | |
| 2013-05-09 | Just added some print statements so I can show matrix/vector | Zachary Sloan | |
| shapes to Tony | |||
| 2013-05-09 | Added original security templates (so we can change them) | Sam | |
| 2013-05-09 | Working on user registration | Sam | |
| 2013-05-08 | Merge branch 'flask' of git://github.com/leiyan/genenetwork into flask | Zachary Sloan | |
 |
index : genenetwork2 | |
| GeneNetwork (2nd generation) |
| aboutsummaryrefslogtreecommitdiff |