Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d082f1c334f3079249ed4d2404c52ac96850dc4b https://github.com/galaxyproject/galaxy/commit/d082f1c334f3079249ed4d2404c52... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/tag.js M static/maps/mvc/tag.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/bundled/login.bundled.js.map M static/scripts/mvc/tag.js Log Message: ----------- Purely clientside implementation of hashtag shortcut for nametags. These are translated to 'name:nametag_value' prior to saving and are persisted in that form. Commit: f3dbf55aad06c64e26fd7dd44db9a87c73835153 https://github.com/galaxyproject/galaxy/commit/f3dbf55aad06c64e26fd7dd44db9a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/tag.js M static/maps/mvc/tag.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tag.js Log Message: ----------- Render 'name:' as hashtags. I personally like the display better and it'll nudge people towards using them I think, while still giving us the 'real' tagging hierarchy to work with. Commit: 9f36bea7f1aa25bc193ec1bcc243d303cbfff1bc https://github.com/galaxyproject/galaxy/commit/9f36bea7f1aa25bc193ec1bcc243d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/tag.js M static/maps/mvc/tag.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tag.js Log Message: ----------- Slight refactoring, also name->hash for recommended tags. Commit: a2b8a7d26ab748d7565ef9245a678bc2740d1bdd https://github.com/galaxyproject/galaxy/commit/a2b8a7d26ab748d7565ef9245a678... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M .travis.yml M client/galaxy/scripts/mvc/ui/ui-select-content.js M config/galaxy.ini.sample M config/plugins/interactive_environments/rstudio/config/allowed_images.yml.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/interactive_environments/rstudio/static/js/rstudio.js M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/model_operations.py M lib/galaxy/tools/execute.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/js/package.json M static/maps/mvc/ui/ui-select-content.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-select-content.js M test/api/test_workflows.py M test/qunit/tests/ui_tests.js Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into hashtags Commit: 1d9b7d592b131b69b91c40eeed3e844df65f67e4 https://github.com/galaxyproject/galaxy/commit/1d9b7d592b131b69b91c40eeed3e8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-04-28 (Fri, 28 Apr 2017) Changed paths: M Makefile M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/objectstore/azure_blob.py M lib/galaxy/tools/__init__.py M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-composite.js M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into hashtags Commit: 7b50ae39b0d4ad5208e97f86c60e16bfa9fcfbff https://github.com/galaxyproject/galaxy/commit/7b50ae39b0d4ad5208e97f86c60e1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M .ci/flake8_wrapper_docstrings.sh M .ci/jenkins/selenium/run_tests.sh M CITATION M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/citation/citation-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-librarylist-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/viz/phyloviz.js M config/galaxy.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample M config/plugins/interactive_environments/rstudio/templates/rstudio.mako M lib/galaxy/config.py M lib/galaxy/managers/configuration.py M lib/galaxy/tools/data_manager/manager.py M lib/galaxy/tools/parameters/validation.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/reports/config.py M lib/galaxy/webapps/tool_shed/config.py M lib/tool_shed/galaxy_install/tools/data_manager.py M run_tests.sh M setup.cfg M static/maps/mvc/citation/citation-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-librarylist-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/viz/phyloviz.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/citation/citation-view.js M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/viz/phyloviz.js M templates/admin/tool_shed_repository/select_tool_panel_section.mako M templates/user/index.mako M templates/webapps/galaxy/admin/center.mako M templates/webapps/galaxy/data_manager/index.mako M templates/webapps/galaxy/galaxy.masthead.mako M templates/webapps/tool_shed/base_panels.mako M test/api/test_jobs.py M test/api/test_workflows.py M test/galaxy_selenium/navigates_galaxy.py M test/qunit/tests/form_tests.js M test/selenium_tests/framework.py M test/selenium_tests/test_workflow_run.py M tox.ini Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into hashtags Commit: 06e2e67872b8de486c189fd513ac5458c91dc2e5 https://github.com/galaxyproject/galaxy/commit/06e2e67872b8de486c189fd513ac5... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-05-01 (Mon, 01 May 2017) Changed paths: M client/galaxy/scripts/mvc/tag.js M static/maps/mvc/tag.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tag.js Log Message: ----------- Merge pull request #3979 from dannon/hashtags Hashtags Compare: https://github.com/galaxyproject/galaxy/compare/edff1e65b9bd...06e2e67872b8