Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9daf348770bc5ff7576db297bd3f959b8a35d006 https://github.com/galaxyproject/galaxy/commit/9daf348770bc5ff7576db297bd3f9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/root.py Log Message: ----------- Basic routing bypass for known client routes, instead of 404ing. Commit: 07925f9d3fbb29f64197d0831c5ac3b6ecea2536 https://github.com/galaxyproject/galaxy/commit/07925f9d3fbb29f64197d0831c5ac... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M lib/galaxy/web/framework/base.py M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Slightly more sane approach to clientside routes. This also fixes tour routing. Commit: b73cde09a238f333f7008c3007410ea82c05591e https://github.com/galaxyproject/galaxy/commit/b73cde09a238f333f7008c3007410... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/root.py Log Message: ----------- Remove hacked routing. Commit: 370ea10f75196e899868a248b1f301d4994debd8 https://github.com/galaxyproject/galaxy/commit/370ea10f75196e899868a248b1f30... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tours.js M static/maps/layout/menu.js.map M static/maps/mvc/tours.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/mvc/tours.js Log Message: ----------- Use real routes for tours, and make them actually work. Now it's possible to open the tour index in a new tab, etc., instead of just using javascript craziness. Commit: 003678576977c6a5ad0c1c83f0d3d61b35210ca2 https://github.com/galaxyproject/galaxy/commit/003678576977c6a5ad0c1c83f0d3d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M client/galaxy/scripts/onload.js M client/grunt-tasks/style.js M lib/galaxy/datatypes/tabular.py M lib/galaxy/external_services/result_handlers/basic.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/context.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/metadata.py M lib/galaxy/model/search.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/export_history.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/util/__init__.py M lib/galaxy/util/dbkeys.py M lib/galaxy/util/json.py M lib/galaxy/visualization/data_providers/basic.py M lib/galaxy/visualization/data_providers/genome.py M lib/galaxy/visualization/genomes.py M lib/galaxy/visualization/plugins/resource_parser.py M lib/galaxy/web/form_builder.py M lib/galaxy/web/framework/decorators.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/data_manager.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/tool_shed/api/categories.py M lib/galaxy/webapps/tool_shed/api/repositories.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/model/__init__.py M lib/galaxy/webapps/tool_shed/model/mapping.py M lib/galaxy/workflow/modules.py M lib/tool_shed/galaxy_install/repair_repository_manager.py M lib/tool_shed/galaxy_install/update_repository_manager.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/util/common_util.py M lib/tool_shed/util/metadata_util.py M lib/tool_shed/util/readme_util.py M lib/tool_shed/util/repository_util.py M lib/tool_shed/util/shed_util_common.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M scripts/functional_tests.py M scripts/transfer.py M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/onload.js M test/docker/base/Dockerfile M test/docker/base/run_test_wrapper.sh M test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py M test/tool_shed/base/twilltestcase.py M test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py M tools/data_source/upload.py Log Message: ----------- Merge, rebuild. Commit: 2714756ae20124e8b170490c21cfdf7e3f91d862 https://github.com/galaxyproject/galaxy/commit/2714756ae20124e8b170490c21cfd... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tours.js M lib/galaxy/web/framework/base.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/root.py M static/maps/layout/menu.js.map M static/maps/mvc/tours.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js M static/scripts/mvc/tours.js Log Message: ----------- Merge pull request #1870 from dannon/routing Tour routing overhaul Compare: https://github.com/galaxyproject/galaxy/compare/f9afe5927b6b...2714756ae201