Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6e13c3999a6d54b40b2910d5ce95da724f133122 https://github.com/galaxyproject/galaxy/commit/6e13c3999a6d54b40b2910d5ce95d... Author: Dave Bouvier dave@bx.psu.edu Date: 2016-02-29 (Mon, 29 Feb 2016)

Changed paths: M lib/galaxy/web/form_builder.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/tool_shed/util/common_util.py M lib/tool_shed/util/metadata_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 test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py

Log Message: ----------- Cherry-picked changes from pull request #1392.

Commit: 3ec58fd1da5f7122752627eef581d5826190bc13 https://github.com/galaxyproject/galaxy/commit/3ec58fd1da5f7122752627eef581d... Author: Dave Bouvier dave@bx.psu.edu Date: 2016-02-29 (Mon, 29 Feb 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py

Log Message: ----------- Update API endpoint names in code comments.

Commit: b15a7ff06df23d7004f670f34638fe9ee5d33f92 https://github.com/galaxyproject/galaxy/commit/b15a7ff06df23d7004f670f34638f... Author: Dave Bouvier dave@bx.psu.edu Date: 2016-03-01 (Tue, 01 Mar 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/api/categories.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Include repository metadata when browsing repositories in a category.

Commit: 02ed07ca82e19e20b37e50e9f6294069240d9ed1 https://github.com/galaxyproject/galaxy/commit/02ed07ca82e19e20b37e50e9f6294... Author: Martin Cech cech.marten@gmail.com Date: 2016-03-03 (Thu, 03 Mar 2016)

Changed paths: M lib/galaxy/web/form_builder.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/tool_shed/util/common_util.py M lib/tool_shed/util/metadata_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 test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py

Log Message: ----------- Merge pull request #1821 from davebx/toolshed_decouple_api

Cherry-picked changes from pull request #1392.

Compare: https://github.com/galaxyproject/galaxy/compare/779793810d1f...02ed07ca82e1