| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-07-03 | Updated notes and created requirements.txt file | Zachary Sloan | |
| 2013-06-21 | Fixed bug where cursor was still being used in query | Zachary Sloan | |
| 2013-06-20 | Removed foobar from top of notes.txt | Zachary Sloan | |
| 2013-06-20 | Added fubar to the top of notes.txt | Zachary Sloan | |
| 2013-06-20 | Added explanation of pushing to github to notes | Zachary Sloan | |
| 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-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-08 | Merge branch 'flask' of git://github.com/leiyan/genenetwork into flask | Zachary Sloan | |
| 2013-05-08 | Worked on correlation page | Lei Yan | |
| Wrote function in dataset.py that gets all the traits in a dataset and their sample values | |||
| 2013-04-24 | Began writing code that writes some objects used in LMM to redis | Zachary Sloan | |
| and writes/reads eachitem in the plink_input | |||
| 2013-04-23 | Created file correlation_plot.py for the correlation scatterplot | Zachary Sloan | |
| Reverted temp_data.py to previous version that doesn't include the "part" input (for chunks) Made change to lmm related to splitting main iterator into chunks Deleted a bunch of unnecessary commented out code from show_trait.py | |||
| 2013-04-18 | LMM code now reads in gzipped pickled plink snp iterator object | Zachary Sloan | |
| 2013-04-18 | input file is now loaded by pickle | Zachary Sloan | |
| 2013-03-22 | Added secure_server.py | Zachary Sloan | |
| Updated notes.txt | |||
| 2013-03-22 | Removed zach_settings.py from git tracking | Zachary Sloan | |
| Changed mysql password as a result of it being up on git before | |||
| 2013-03-13 | Added some to notes | Zachary Sloan | |
| 2013-03-05 | Implemented DataTables; there are now options to download the marker | Zachary Sloan | |
| regression result table in various formats | |||
| 2013-02-22 | Added some to notes | Zachary Sloan | |
| 2013-02-21 | Adding genotypes and new_genotypes (json files) directories to git | Zachary Sloan | |
| so they can be pulled to the new EC2 server | |||
| 2013-01-31 | Deleted nginx.conf from the other_conf directory not in wqflask | Zachary Sloan | |
| 2013-01-25 | Added a bunch of things to notes | Zachary Sloan | |
| 2013-01-24 | Added a lot to the notes in the process of setting up on the | Zachary Sloan | |
| new server | |||
| 2013-01-23 | Added a bunch to notes and created new notes file specifically | Zachary Sloan | |
| related to installing a new instance of GN | |||
| 2013-01-22 | Added a couple things to notes regarding installing mysql client | Zachary Sloan | |
| 2013-01-18 | Renamed CorrelationPage.py to show_corr_results.py | Zachary Sloan | |
| Worked with correlation code; got to the code that begins to do the actual correlations Created a function "get_dataset_and_trait" in the new file "helper_functions.py" because the code initializing the dataset and trait objects was repeated in multiple places | |||
| 2013-01-11 | Overwrote requirements.txt | Zachary Sloan | |
| 2013-01-04 | Correct results are being returned from reaper for the marker regression page | Zachary Sloan | |
| 2012-12-05 | Renamed webqtlTrait.py to trait.py | Zachary Sloan | |
| Renamed webqtlTrait class to GeneralTrait Began process of removing fd from show_trait.py Created DatasetGroup object in data_set.py (this may end up becoming its own file later if it becomes big enough) | |||
| 2012-11-21 | Changed parser to allow for bother square brackets and parentheses | Zachary Sloan | |
| Changed show_trait.coffee to get the stats table working again Still need to get stats table to work with changed values | |||
| 2012-11-01 | Began integrating do_search.py's DoSearch object into search_results.py, | Zachary Sloan | |
| with simple searches returning correct results Still need to make results display in the table Sam also did some work with the bootstrap styling | |||
| 2012-10-23 | Finished coffeescript that handles the home page dataset selection dropdowns | Zachary Sloan | |
| 2012-10-19 | Finished gen_select_dataset.py which generates the json file that defines the | Zachary Sloan | |
| data structure used for the index page select dropdowns | |||
| 2012-10-09 | Used tidyp to improve/beautify index_page.html | Zachary Sloan | |
| 2012-09-25 | Fixed issue with parent strains appearing twice and began replacing variable ↵ | Zachary Sloan | |
| names (strain -> sample, for example) | |||
| 2012-09-13 | Worked on improving readData and informativeStrains functions in ↵ | Zachary Sloan | |
| webqtlFormData while trying to get correlation page running | |||
| 2012-09-12 | Worked towards correctly passing form data to correlation page and addressed ↵ | Zachary Sloan | |
| various bugs that arose while doing so | |||
 |
index : genenetwork2 | |
| GeneNetwork (2nd generation) |
| aboutsummaryrefslogtreecommitdiff |