Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6d3b11f3e76f8a9c4cde96b5a1ad0d5fca405edf https://github.com/galaxyproject/galaxy/commit/6d3b11f3e76f8a9c4cde96b5a1ad0... Author: anuprulez anup.rulez@gmail.com Date: 2017-07-27 (Thu, 27 Jul 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M lib/galaxy/webapps/galaxy/api/workflows.py M static/maps/mvc/workflow/workflow.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/workflow/workflow.js

Log Message: ----------- Moving show workflows in tools panel feature to workflow main view

Commit: 8010cd351da006654e2eee2b124bc10c2e43017a https://github.com/galaxyproject/galaxy/commit/8010cd351da006654e2eee2b124bc... Author: anuprulez anup.rulez@gmail.com Date: 2017-07-28 (Fri, 28 Jul 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js R client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/style/less/base.less M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py 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/style/blue/base.css

Log Message: ----------- Removing the view for configure workflow menu

Commit: 33cc830fb11f9eeee5ecaac39518869de09d7c7a https://github.com/galaxyproject/galaxy/commit/33cc830fb11f9eeee5ecaac395188... Author: anuprulez anup.rulez@gmail.com Date: 2017-07-28 (Fri, 28 Jul 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M static/maps/mvc/workflow/workflow.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map

Log Message: ----------- Adding comments

Commit: 60aa8e0caf87c4b4c90ea499277af4d08c3c6b93 https://github.com/galaxyproject/galaxy/commit/60aa8e0caf87c4b4c90ea499277af... Author: anuprulez anup.rulez@gmail.com Date: 2017-07-28 (Fri, 28 Jul 2017)

Changed paths: M client/galaxy/scripts/nls/fr/locale.js

Log Message: ----------- Merge branch 'dev' of https://github.com/bgruening/galaxy into workflow_configure_menu

Commit: 02c40bbcbe644f03ba5ea3b83d33bde895fb58e5 https://github.com/galaxyproject/galaxy/commit/02c40bbcbe644f03ba5ea3b83d33b... Author: anuprulez anup.rulez@gmail.com Date: 2017-07-30 (Sun, 30 Jul 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M static/maps/mvc/workflow/workflow.js.map M static/maps/nls/fr/locale.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/workflow/workflow.js M static/scripts/nls/fr/locale.js

Log Message: ----------- Fix review comments: removing self from multiple places and correct '>'

Commit: ec4d6c0c56e9722db28800c54e0e0a5127330bdf https://github.com/galaxyproject/galaxy/commit/ec4d6c0c56e9722db28800c54e0e0... Author: anuprulez anup.rulez@gmail.com Date: 2017-08-01 (Tue, 01 Aug 2017)

Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M static/maps/mvc/workflow/workflow.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/workflow/workflow.js

Log Message: ----------- Removing the unencoded workflow id from the api and UI

Commit: 5eb61b689b70b21a1e3f603a206b0fd5731510be https://github.com/galaxyproject/galaxy/commit/5eb61b689b70b21a1e3f603a206b0... Author: anuprulez anup.rulez@gmail.com Date: 2017-08-01 (Tue, 01 Aug 2017)

Changed paths: M config/tool_shed.ini.sample M lib/galaxy/jobs/runners/cli.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/controllers/admin.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

Log Message: ----------- Merge branch 'dev' of https://github.com/bgruening/galaxy into workflow_configure_menu

Commit: 826f53d8ad4171c86cc81755f219ae0d4e65971f https://github.com/galaxyproject/galaxy/commit/826f53d8ad4171c86cc81755f219a... Author: anuprulez anup.rulez@gmail.com Date: 2017-08-01 (Tue, 01 Aug 2017)

Changed paths: M client/galaxy/scripts/mvc/user/user-preferences.js M static/maps/mvc/user/user-preferences.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/user/user-preferences.js

Log Message: ----------- Removing the configure menu link from user preferences

Commit: 7fe464c821ba9ef3c94f054a6545f938f5d05a52 https://github.com/galaxyproject/galaxy/commit/7fe464c821ba9ef3c94f054a6545f... Author: anuprulez anup.rulez@gmail.com Date: 2017-08-01 (Tue, 01 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 lib/galaxy/model/metadata.py M lib/galaxy/security/__init__.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py A static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-li-edit.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 R templates/webapps/galaxy/dataset/edit_attributes.mako

Log Message: ----------- Merge with dev

Commit: 324ec35c86c7444b628e301affe1d918f1a2d71f https://github.com/galaxyproject/galaxy/commit/324ec35c86c7444b628e301affe1d... Author: anuprulez anup.rulez@gmail.com Date: 2017-08-01 (Tue, 01 Aug 2017)

Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py

Log Message: ----------- Restoring the get configure menu api and decode ids

Commit: 14360d6737fb3bf42264454939f179ea26fe902c https://github.com/galaxyproject/galaxy/commit/14360d6737fb3bf42264454939f17... Author: Aysam Guerler aysam.guerler@gmail.com Date: 2017-08-02 (Wed, 02 Aug 2017)

Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js R client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/style/less/base.less M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow.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/user/user-preferences.js M static/scripts/mvc/workflow/workflow.js M static/style/blue/base.css

Log Message: ----------- Merge pull request #4353 from bgruening/workflow_configure_menu

Merging configure menu with main workflow view

Compare: https://github.com/galaxyproject/galaxy/compare/f41d2ba8ecf6...14360d6737fb