Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 5f1b7d5a5060c3c45601b499a953113e0b1b3125 https://github.com/galaxyproject/galaxy/commit/5f1b7d5a5060c3c45601b499a9531... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Show verison button in workflow editor and trigger on_change Commit: 25e05b62c7b529b0379e3ff50fc75ccb5b8c28b6 https://github.com/galaxyproject/galaxy/commit/25e05b62c7b529b0379e3ff50fc75... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js Log Message: ----------- Do postchange action only when modifiying tool versions in the workflow editor Commit: 5afe490822325d4aa6c9be726183175743dc88f6 https://github.com/galaxyproject/galaxy/commit/5afe490822325d4aa6c9be7261831... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Fix qunit test Commit: 36ce9113f7ccb6372bc2d1f8e92e95a8aafdd066 https://github.com/galaxyproject/galaxy/commit/36ce9113f7ccb6372bc2d1f8e92e9... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-manager.js Log Message: ----------- Keep spacing consistent (thx @nsoranzo) Commit: 526e98e372e61747b1e3cd4b86a04603ca08959b https://github.com/galaxyproject/galaxy/commit/526e98e372e61747b1e3cd4b86a04... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Reset outputs when changing tool versions in wf-editor Commit: db2ea853f699bf6b55b67cf7199ab355196910bc https://github.com/galaxyproject/galaxy/commit/db2ea853f699bf6b55b67cf7199ab... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Now thing are mostly working -- input and output connections are correctly altered ... but saving the workflow and reloading occasionally loads the wrong workflow Commit: ea1f4f866658e77465d1272b4d7f37bb85ee488b https://github.com/galaxyproject/galaxy/commit/ea1f4f866658e77465d1272b4d7f3... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-manager.js Log Message: ----------- Fix the occasional loading of the wrong workflow. Turns out that sometimes the tool_version is undefined (i.e) if the exact node had not been manipulated, but config_form.version is always up to date Commit: bc95f5e81b46a0bee54f6ffdd5c3a6615258af20 https://github.com/galaxyproject/galaxy/commit/bc95f5e81b46a0bee54f6ffdd5c3a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Now adding/removing datasets and multiple version switches work fine, but PJA parameters are still problematic Commit: 92fedc0ae86127d670f3ff8e829d07ee657f30d7 https://github.com/galaxyproject/galaxy/commit/92fedc0ae86127d670f3ff8e829d0... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Fix logic for adding and removing outputs Commit: 1c286b158a8304380f499709b2f14c958b6fe203 https://github.com/galaxyproject/galaxy/commit/1c286b158a8304380f499709b2f14... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Remove extra newlines Commit: 2e95026317e2e781163cf8bd4449bfd5ddfb894f https://github.com/galaxyproject/galaxy/commit/2e95026317e2e781163cf8bd4449b... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js Log Message: ----------- Remove unused old_version variable Commit: 31c423a45a4186c41981f71d41a590177bad033d https://github.com/galaxyproject/galaxy/commit/31c423a45a4186c41981f71d41a59... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Fix typo and remove leftover comment (thanks @nsoranzo) Commit: df91881c1f4dba06a9fb6a1720db68d059664041 https://github.com/galaxyproject/galaxy/commit/df91881c1f4dba06a9fb6a1720db6... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-13 (Sun, 13 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-node.js Log Message: ----------- Remove unused workflow outputs Commit: 73f4141d96ad54c25fdf7a3ffb458f2b1933e14e https://github.com/galaxyproject/galaxy/commit/73f4141d96ad54c25fdf7a3ffb458... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view.js.map 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.map M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Add static JS Commit: aa7be28960a43802bd476be1d7d996c85134c055 https://github.com/galaxyproject/galaxy/commit/aa7be28960a43802bd476be1d7d99... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/config.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/jobs/__init__.py M lib/galaxy/managers/workflows.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/util/checkers.py M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/admin.bundled.js.map 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/library/library-foldertoolbar-view.js A test-data/1.sam.gz A test-data/bad.html.gz A test-data/random-file M test/api/test_tools.py M test/base/api.py M test/base/interactor.py M test/base/populators.py M test/functional/tools/sample_datatypes_conf.xml A test/integration/test_upload_configuration_options.py M tools/data_source/upload.py M tools/data_source/upload.xml Log Message: ----------- Merge branch 'dev' into switch_versions_in_workflows Commit: 27be24963837354af6cac1f429c1bc06e95626e1 https://github.com/galaxyproject/galaxy/commit/27be24963837354af6cac1f429c1b... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-08-15 (Tue, 15 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/scripts/mvc/workflow/workflow-node.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M static/maps/mvc/tool/tool-form-base.js.map M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-manager.js.map M static/maps/mvc/workflow/workflow-node.js.map M static/maps/mvc/workflow/workflow-view.js.map 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.map M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-manager.js M static/scripts/mvc/workflow/workflow-node.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Merge pull request #4373 from mvdbeek/switch_versions_in_workflows Allow switching tool versions in workflow editor Compare: https://github.com/galaxyproject/galaxy/compare/44548f8f2fe2...27be24963837