aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-03-15Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2016-03-15Added mapping output file directory to gitignorezsloan
2016-03-03Fixed issue where correlation would do mapping if run after mappingzsloan
2016-03-03Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2016-03-03Fixed trait export to include SE valueszsloan
2016-03-03Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2016-03-03Update gsearch.pyLei Yan
2016-03-02Increased gsearch speed by removing unnecessary query for sample data...Still slower than preferable due to having to query the gn1 database for every trait in the search results zsloan
2016-03-01Merge branch 'master' of https://github.com/genenetwork/genenetwork2zsloan
2016-03-01Committing change to dataset menu before pullzsloan
2016-03-01Fixed csv download and removed non-working "Download Table" button for collec......Not sure what the best way to determine the filename is, so just using "search_results" or "collection_list" for now In future I want to replace the default csv download button by attaching its function to the previous "Download Table" button zsloan
2016-02-26PLINK should not run correctly and graph using GN1 image...Updated dataset menu structure json Increased the width for the label and text field for inputting MAF for PLINK and GEMMA zsloan
2016-02-25fixed untracked fileszsloan
2016-02-24GEMMA mostly working with gn1 mapping, though there may be some issue with th...zsloan
2016-02-18Edited gen_select_dataset to remove confidential datasets...Also hard-coded the removal of Macaque Monkey since I couldn't think of a good way to retroactively check if every dataset in a species is confidential zsloan
2016-02-15Fixed R/qtl mapping so the group (BXD, etc) isn't hardcoded...Removed an extraneous </td> tag from the show trait page zsloan
2016-02-11Updated jquery validation plugin, now works in IE...Fixed a couple minor html syntax erors in login_user.html and base.html Changed export button on correlation page to csvHtml5, but still has problem with commas in fields being interpreted as a new column zsloan
2016-02-08Fixed the logic if how the correlation page applies filters (mean expression,......Added back some colorbox directories that we apparently need (I had removed them in an earlier commit) zsloan
2016-02-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into development...Conflicts: .gitignore zsloan
2016-02-08Guix: installation notespjotrp
2016-02-08Renamed misc dir to docpjotrp
2016-02-08Removing LFSpjotrp
2016-02-08gitignore: resolved conflictpjotrp
2016-02-08Merge branch 'master' of github.com:genenetwork/genenetwork2 into gn-masterpjotrp
2016-02-04Most importantly, this commit fixes an issue that caused the trait page to no......An Intro section is also added to the header, though for the time being its contents aren't populated and the edit option isn't working zsloan
2016-01-29Info button should now work for phenotype and genotype datasetszsloan
2016-01-27Merge branch 'master' of github.com:genenetwork/genenetwork2 into developmentzsloan
2016-01-27Added info button to Dataset dropdown on index page...Fixed script that generates dataset dropdown json file to include accession id Fixed dataset link on search results page zsloan
2016-01-26Removed a bunch of files/directories/packages that are no longer used and som...zsloan
2016-01-21MANIFEST: Ignore output datapjotrp
2016-01-21Adding html+js+css+img files into MANIFESTpjotrp
2016-01-19Adding Python setup.py supportpjotrp
2016-01-15Cofactor now works with reaperzsloan
2016-01-14Regular and single chr views work for qtl reaper now...Single chr now works for R/qtl (didn't before) Merged qtl reaper code into marker_regression.py zsloan
2016-01-12Mapping works for rqtl and centimorgan scalezsloan
2016-01-06Single chromosome view now works for mapping page using GN1's image code...Removed loading bar that appeared on show trait page since it didn't work with GN1 mapping (which opens in a new page) zsloan
2016-01-04Added headers/foots/css to mapping page...Mapping results table now works zsloan
2015-12-18Mapping results open in new window; still need to add header/footer/jszsloan
2015-12-18Added image map for figurezsloan
2015-12-15Added the js_data so both the GN1 and GN2 figures can be displayedzsloan
2015-12-14GN1 mapping full genome figure now correct for pylmm and output to web pagezsloan
2015-12-12Changed loop drawing qtl curve to fix some issues; still need to make it draw...zsloan
2015-12-09Disabled GN1 mapping for master branch; mistakenly pushed with it enabled beforezsloan
2015-12-09Fixed search result page text to make sense for all working search terms...Added a bunch of print statements to GN1 mapping code to locate where code stalls zsloan
2015-12-04Commented out code related to additive/dominance effect in gn1 marker regress...zsloan
2015-11-18Fixed issue where literature and tissue correlation didn't work...Scatterplot matrix feature only appears if user is logged in now Committing current progress on mapping page (it can at least import the file now, but there are still errors) zsloan
2015-11-18Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloanpjotrp
2015-11-09Fixed issue that caused mapping to not work; for some reason the path to pylm...zsloan
2015-11-05Fixed issue where misplaced html comment end hid all phenotype table resultszsloan
2015-10-23Fixed error if you click search after entering white spaces; Ethan's fix only...zsloan
generated by cgit v1.2.3 (git 2.46.2) at 2024-12-04 18:44:27 +0000