aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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
2013-04-30Changed path to log fileLei Yan
Added server port to configuration file
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 ↵Zachary Sloan
statements Continued work on file that processes each individual chunk of the snp iterator/plink input
2013-04-24Began writing code that writes some objects used in LMM to redisZachary Sloan
and writes/reads eachitem in the plink_input
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 scatterplotZachary 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-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, butZachary Sloan
we might decide to store it differently
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) dataZachary Sloan
for HLC datasets Still need to read in file
2013-04-17Added a benchmark for running the chunks code on the list of snpsZachary Sloan
2013-04-17Renamed chunk_test.py to chunks.pyZachary Sloan
2013-04-17Updated chunk_test.pyZachary Sloan
2013-04-17Added chunk_test.py which compared my/ and sam's split intoZachary Sloan
chunks algorithms' accuracy/speed
2013-04-17Wrote code that tests the effectiveness of the function that divides aZachary Sloan
list into a given number of chunks
2013-04-17Fixed small issue with the divide_into_chunks functionZachary Sloan
that caused one too many chunks to be created
2013-04-16Wrote functions that divide a list into a specified number of chunksZachary Sloan
(to be used on the list of snps for the LMM code)