Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 27e7da9406486fc2a7d40c36332e480d84aab407 https://github.com/galaxyproject/galaxy/commit/27e7da9406486fc2a7d40c36332e4... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-27 (Thu, 27 Jul 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix bug: 4247 in search overlay Commit: 1e18e6b0795c303172c21c038cd145ef75b51720 https://github.com/galaxyproject/galaxy/commit/1e18e6b0795c303172c21c038cd14... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-27 (Thu, 27 Jul 2017) Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/model/mapping.py Log Message: ----------- Merge branch 'dev' of https://github.com/bgruening/galaxy into searchoverlay_bugfix Commit: bcecec0713e6778ab6850320943ad12b5f184f16 https://github.com/galaxyproject/galaxy/commit/bcecec0713e6778ab6850320943ad... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js A client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/nls/fr/locale.js M config/tool_shed.ini.sample M lib/galaxy/jobs/runners/cli.py M lib/galaxy/model/metadata.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/deps/conda_util.py R lib/galaxy/web/base/controllers/__init__.py R lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/api/quotas.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/admin.py M lib/galaxy/workflow/modules.py A lib/tool_shed/util/admin_util.py A static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/fr/locale.js.map M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.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 M static/scripts/bundled/login.bundled.js.map A static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/nls/fr/locale.js R templates/webapps/galaxy/dataset/edit_attributes.mako Log Message: ----------- Merge with dev Commit: f41d2ba8ecf6440901fd1106b6bafa6377098ad9 https://github.com/galaxyproject/galaxy/commit/f41d2ba8ecf6440901fd1106b6baf... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M config/plugins/webhooks/demo/search/static/script.js Log Message: ----------- Merge pull request #4348 from bgruening/searchoverlay_bugfix Search Overlay plugin bug fix Compare: https://github.com/galaxyproject/galaxy/compare/98292a0a124a...f41d2ba8ecf6