aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2013-06-13Small changesSam
2013-06-12Fixed a couple issues with the template that caused the...regular search results and show trait page to not display Zachary Sloan
2013-06-11Put trait info for correlation results page into a dictionary instead...of storing list of GeneralTrait objects Added print statements to track memory usage Lei Yan
2013-05-31Fixed the location column for the quick search page...Began writing some jquery to automatically open the first tab within each species tab on the quick search page (not done yet) Zachary Sloan
2013-05-30Rewrote some code in get_trait_info in dataset.py...Added spearman correlation to show_corr_results and template Lei Yan
2013-05-28Have correlation values appearing in a table in the template...Use scipy to calculate pearson correlation instead of old GN code Lei Yan
2013-05-23Worked on rewriting the function in data_set.py that gets the sample...values for each trait Lei Yan
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 code...Created css file to hold modal padding Sam
2013-05-17Modal windows now working better...Going to simplify the code next Sam
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 by...trait type (was the opposite before Rob commented on it earlier today) Zachary Sloan
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/vector...shapes to Tony Zachary Sloan
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 page...Wrote function in dataset.py that gets all the traits in a dataset and their sample values Lei Yan
2013-05-07Made some progress adding species/group tabs to the quick search result page to...make the results easier to navigate Zachary Sloan
2013-05-02Got quick search code running (but not displaying properly)...Code that processes subset of snps works, in process of putting into a class Zachary Sloan
2013-04-30Merge branch 'flask' of git://github.com/leiyan/genenetwork into flaskZachary Sloan
2013-04-30Changed path to log file...Added server port to configuration file Lei Yan
2013-04-30Did a little with correlation_plot.pyZachary Sloan
2013-04-26Added file that checks how much time is added to a loop's runtime by print st......Continued work on file that processes each individual chunk of the snp iterator/plink input Zachary Sloan
2013-04-24Began writing code that writes some objects used in LMM to redis...and writes/reads eachitem in the plink_input Zachary Sloan
2013-04-24Added original pylintrcZachary Sloan
2013-04-24Checking in quick_search_table.py before using pylinZachary Sloan
2013-04-24Fixed issue with the part of quick_search_table.py that loads phenotype traitsZachary Sloan
2013-04-23Created file correlation_plot.py for the correlation scatterplot...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 Zachary Sloan
2013-04-19Fixed the issue with the x-axis coordinates for marker regression plotZachary Sloan
2013-04-18The plink_input is split into chunks that are stored in temp_data, but...we might decide to store it differently Zachary Sloan
2013-04-18LMM code now reads in gzipped pickled plink snp iterator objectZachary Sloan
2013-04-18input file is now loaded by pickleZachary Sloan
2013-04-17Created file with pickled SNPIterator (from input.py) data...for HLC datasets Still need to read in file Zachary Sloan