Branch: refs/heads/release_16.01
Home:
https://github.com/galaxyproject/galaxy
Commit: 5bc55f9fa2fd6af9142df644bf82e830b56f9ce4
https://github.com/galaxyproject/galaxy/commit/5bc55f9fa2fd6af9142df644bf...
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Changed paths:
M templates/webapps/tool_shed/base_panels.mako
Log Message:
-----------
Add js for mako based masthead
Commit: 281f5b734610963b437b72837e7b71cebbb3c5bd
https://github.com/galaxyproject/galaxy/commit/281f5b734610963b437b72837e...
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Changed paths:
M client/galaxy/scripts/mvc/ui/popup-menu.js
M client/galaxy/scripts/mvc/workflow/workflow-terminals.js
M client/galaxy/style/less/base.less
M client/galaxy/style/less/fontawesome/core.less
M client/galaxy/style/less/ui/icon-btn.less
M doc/source/releases/16.01.rst
M doc/source/releases/16.01_announce.rst
M lib/galaxy/config.py
M lib/galaxy/exceptions/__init__.py
M lib/galaxy/exceptions/error_codes.json
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/objectstore/__init__.py
M lib/galaxy/objectstore/rods.py
M lib/galaxy/objectstore/s3.py
M lib/galaxy/tools/imp_exp/__init__.py
M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/util/__init__.py
M lib/galaxy/version.py
M lib/galaxy/web/base/interactive_environments.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/tool_shed/capsule/capsule_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/util/commit_util.py
M lib/tool_shed/util/encoding_util.py
M lib/tool_shed/util/repository_content_util.py
M lib/tool_shed/util/shed_util_common.py
M static/maps/mvc/ui/popup-menu.js.map
M static/maps/mvc/workflow/workflow-terminals.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/mvc/ui/popup-menu.js
M static/scripts/mvc/workflow/workflow-terminals.js
M static/style/blue/base.css
R templates/admin/requests/select_datasets_to_transfer.mako
M templates/admin/tool_shed_repository/common.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/requests/common/common.mako
M templates/webapps/galaxy/requests/common/view_request_history.mako
M templates/webapps/galaxy/requests/common/view_sample_datasets.mako
M templates/webapps/galaxy/workflow/run.mako
M templates/webapps/tool_shed/repository/common.mako
M test/functional/tools/output_format.xml
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/base/twilltestcase.py
M test/unit/jobs/test_job_wrapper.py
M test/unit/tools_support.py
Log Message:
-----------
Merge branch 'release_16.01' of
https://github.com/galaxyproject/galaxy into
release_16.01
Commit: fa8beb225004d27da24065f8f633c7917b5be942
https://github.com/galaxyproject/galaxy/commit/fa8beb225004d27da24065f8f6...
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Changed paths:
M templates/webapps/tool_shed/base_panels.mako
Log Message:
-----------
Merge pull request #1823 from martenson/port-masthead-fix
[16.01] Port masthead fix
Compare:
https://github.com/galaxyproject/galaxy/compare/47c93180708e...fa8beb225004