Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9e0973d7203ba36d5f3f37357d6cea6e603ba465 https://github.com/galaxyproject/galaxy/commit/9e0973d7203ba36d5f3f37357d6ce... Author: James Taylor <james@jamestaylor.org> Date: 2015-10-31 (Sat, 31 Oct 2015) Changed paths: M client/galaxy/scripts/templates/compiled/tool_link.js M client/galaxy/scripts/templates/tool_link.handlebars M client/galaxy/style/less/base.less M client/galaxy/style/less/bootstrap.less M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py M static/maps/galaxy.library.js.map M static/maps/templates/compiled/tool_link.js.map M static/scripts/galaxy.library.js M static/scripts/templates/compiled/tool_link.js M static/style/blue/base.css Log Message: ----------- Labels for individual tools in tool panel. Allow one or more labels to be attached to a tool in the tool panel. These will be rendered to the right of the tool's link using the boostrap label style. Styles for specific labels can be defined in CSS, specific colored labels for "new" and "beta" are defined. Commit: f920dec0c277e8301bf8392d638757a70a441dc7 https://github.com/galaxyproject/galaxy/commit/f920dec0c277e8301bf8392d63875... Author: James Taylor <james@jamestaylor.org> Date: 2015-10-31 (Sat, 31 Oct 2015) Changed paths: M lib/galaxy/tools/__init__.py M lib/galaxy/tools/search/__init__.py Log Message: ----------- Make toolbox searchable by tool labels. Commit: 9fd0bd1cc112811b10a9a16ae47bf76eef6eaaff https://github.com/galaxyproject/galaxy/commit/9fd0bd1cc112811b10a9a16ae47bf... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-11-03 (Tue, 03 Nov 2015) Changed paths: M client/galaxy/scripts/templates/compiled/tool_link.js M client/galaxy/scripts/templates/tool_link.handlebars M client/galaxy/style/less/base.less M client/galaxy/style/less/bootstrap.less M lib/galaxy/tools/__init__.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/tools/toolbox/base.py M static/maps/templates/compiled/tool_link.js.map M static/scripts/templates/compiled/tool_link.js M static/style/blue/base.css Log Message: ----------- Manual merge and rebuild due to conflict. Compare: https://github.com/galaxyproject/galaxy/compare/269ed53fcdc6...9fd0bd1cc112