aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-04Fixed issue that caused adding to existing collections when not logged in to ↵zsloan
not work correctly. The problem was that it would get the collection name from the "new_collection" field instead of the "existing_collections" dropdown.
2016-10-03Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2016-10-03Fixed problem that caused R/qtl with permutations to not work correctlyzsloan
2016-10-03Moved rqtl mapping code out of marker_regression and into its own file.zsloan
Later we will want to run all mapping methods outside of the web server, though
2016-10-02Error page: trim error messagesPjotr Prins
2016-10-02Errors: added time stamps in UTCPjotr Prins
2016-10-02Error page: also display the URLPjotr Prins
2016-10-02Merge branch 'master' of github.com:genenetwork/genenetwork2Pjotr Prins
2016-10-02Error page: use cookies to fixate the animation for one errorPjotr Prins
2016-10-02Error: remove test errorPjotr Prins
2016-10-02Error screen improvements with animated gifsPjotr Prins
2016-09-30Merge pull request #192 from lyan6/masterPjotr Prins
Fix global search "il6" for "Internal Server Error". Add single quote…
2016-09-30Add missing __init__.pyPjotr Prins
2016-09-30Add logging for qtlreaperPjotr Prins
2016-09-29Fix global search "il6" for "Internal Server Error". Add single quotes into ↵Lei Yan
MySQL query.
2016-09-27Remove reintroduced geno fileszsloan
2016-09-27Conflict in wqflask/wqflask/templates/show_trait_mapping_tools.htmlzsloan
2016-09-26Test: added mechanize test for CIM (reaper)Pjotr Prins
2016-09-26Test: added pylmm testPjotr Prins
2016-09-26Test: --all switch addedPjotr Prins
2016-09-26Doc: edits from ZwetsPjotr Prins
2016-09-26Mechanical Rob: make it possible to run single testsPjotr Prins
2016-09-26Test: mechanical Rob executes scanone testPjotr Prins
2016-09-26Settings: LOCAL_PRIVATE_FILESPjotr Prins
2016-09-25Test: should be a Post with parameters filled inPjotr Prins
2016-09-25Logger: use output for assessing mapping parametersPjotr Prins
2016-09-25Test: input parameters for mappingPjotr Prins
2016-09-25Make sure MAPPING_PATH existsPjotr Prins
2016-09-25Settings: enforce MAPPING_PATH only when running plink_gemmaPjotr Prins
2016-09-25Removed large genotype_files from repository. The current set was savedPjotr Prins
in http://files.genenetwork.org/data_files/ and can be used when unpacked in GENENETWORK_FILES (see ./etc/default_settings.py)
2016-09-25Testing: looking for a way to run pylmmPjotr Prins
2016-09-25I was getting below error with the small database. This commit, at least, doesPjotr Prins
not assume the item exists. ERROR:wqflask:Exception on /marker_regression [POST] Traceback (most recent call last): File "/home/wrk/.guix-profile/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg/flask/app.py", line 1817, in wsgi_app response = self.full_dispatch_request() File "/home/wrk/.guix-profile/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg/flask/app.py", line 1477, in full_dispatch_request rv = self.handle_user_exception(e) File "/home/wrk/.guix-profile/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg/flask/app.py", line 1381, in handle_user_exception reraise(exc_type, exc_value, tb) File "/home/wrk/.guix-profile/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg/flask/app.py", line 1475, in full_dispatch_request rv = self.dispatch_request() File "/home/wrk/.guix-profile/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg/flask/app.py", line 1461, in dispatch_request return self.view_functions[rule.endpoint](**req.view_args) File "/export2/izip/git/opensource/genenetwork/sumo_gn2/wqflask/wqflask/views.py", line 460, in marker_regression_page template_vars = marker_regression.MarkerRegression(start_vars, temp_uuid) File "/export2/izip/git/opensource/genenetwork/sumo_gn2/wqflask/wqflask/marker_regression/marker_regression.py", line 74, in __init__ value = start_vars['value:' + sample] KeyError: 'value:BXD80'
2016-09-25tools: export GENENETWORK_FILES and move cache into TMPDIR/gn2Pjotr Prins
2016-09-25Doc: Section on reproducibilityPjotr Prins
- fixed SVG URLs
2016-09-13Save Image now works for Network Graph and downloads current graph as a pngzsloan
2016-09-13Fixed the path for the json file in gen_select_dataset.py since it was wrong ↵zsloan
and uncommented simplejson import Added "Reset" option to network graph that returns all the nodes/edges Made the visualization options area in the network graph a little wider
2016-09-13Merge pull request #181 from pjotrp/zsloanzsloan
Run scripts from ./wqflask - just like the webserver
2016-09-13Run scripts from ./wqflask - just like the webserverPjotr Prins
2016-09-12Merge pull request #180 from pjotrp/zsloanzsloan
Support maintenance scripts
2016-09-10CommentPjotr Prins
2016-09-10Support for running maintenance scripts so they can pick up all webserver ↵Pjotr Prins
settings Run with ./bin/genenetwork2 ~/my_settings.py -c ./wqflask/maintenance/gen_select_dataset.py
2016-09-10Merge branch 'development' of github.com:genenetwork/genenetwork2 into zsloanPjotr Prins
2016-09-10Doc: Rpy2 notePjotr Prins
2016-09-09Added a couple options for network graph - Focus Trait, Layout, and a ↵zsloan
correlation slider. The first only displays the edges for the specified trait/node, the second changes layout, and the third hides nodes/edges with abs(correlation) less than the slider's value Changed/added a couple node/edge attributes for network graph Updated dataset menu structure json file to include the human RETINA data set Added css file for network graph page (specifically to make the appearance of the options resemble the RETINA website's)
2016-09-09Merge branch 'master' of github.com:genenetwork/genenetwork2Pjotr Prins
2016-09-09Doc: note on guix pathsPjotr Prins
2016-09-02Added Network Graph feature that uses cytoscape.js. Currently you can view ↵zsloan
GN2 and third party links when clicking a node, view scatterplot when clicking an edge, and edges appearance varies based upon correlation Fixed issue that caused error with correlation page
2016-08-26Fixed appearance (border width mostly) of basic stats table on trait pagezsloan
Removed unnecessary datatables javascript code that referred to basic stats table
2016-08-24Fixed issue causing bootstrap results to not plot correctly.zsloan
2016-08-24Replaced post-publication description with pre-publication description for ↵zsloan
confidential phenotype traits in search results and trait pages Fixed table style for mapping results and interval analyst tables and added additive/dominance effect columns to the former Fixed mapping figure X-axis to accurately label Centimorgans vs Megabases (previously it would always say Megabases) Removed the "Sequence Site" marker from mapping result figure when mapping with genetics (centimorgans) scale Removed some unused javascript libary imports from search/global search pages