Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c51adf781a1a711c4e54d89fbdca7ea9d3331f08 https://github.com/galaxyproject/galaxy/commit/c51adf781a1a711c4e54d89fbdca7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-30 (Thu, 30 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M static/maps/mvc/ui/ui-options.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/ui/ui-options.js Log Message: ----------- Insert update caller/helper for options Commit: c8eb2c186def4b505143a5a6b0d971549b15d19a https://github.com/galaxyproject/galaxy/commit/c8eb2c186def4b505143a5a6b0d97... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M static/maps/mvc/ui/ui-options.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/ui/ui-options.js Log Message: ----------- Merge pull request #3851 from guerler/add_lost_update_caller [17.01] Fix update caller/helper for options Commit: 99c8f2c9fc6f335863f134a5b8b4055d5079cfe1 https://github.com/galaxyproject/galaxy/commit/99c8f2c9fc6f335863f134a5b8b40... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Fix setting UUID on steps when copying steps from another workflow. It seems like the client is correctly setting the UUID to None, but the backend is treating the None as a UUID because it was (incorrectly IMO) making a distinction between ``uuid`` being absent and being set to ``None``. Fixes #3845. Commit: 268aac29526b3526a42457576e8de7867c2bfe1f https://github.com/galaxyproject/galaxy/commit/268aac29526b3526a42457576e8de... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/managers/workflows.py Log Message: ----------- Merge pull request #3856 from jmchilton/1701_uuid_on_copy_fix [17.01] Fix setting UUID on steps when copying steps from another workflow. Commit: 5b46c431b416e619a7ac5467527ab30743eabd33 https://github.com/galaxyproject/galaxy/commit/5b46c431b416e619a7ac5467527ab... Author: John Chilton <jmchilton@gmail.com> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Fix certain aspects of dataset reductions in conditionals/repeats. For instance, fixes #3859 restoring the correct ``element_identifier`` for reduces collections in conditionals. Add tests for combinations of repeats and conditionals. Commit: 3c080cae96aadccd824aa7cf6fda9c4b5bf7471a https://github.com/galaxyproject/galaxy/commit/3c080cae96aadccd824aa7cf6fda9... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-04-03 (Mon, 03 Apr 2017) Changed paths: M lib/galaxy/tools/actions/__init__.py M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #3864 from jmchilton/fix_identifiers_in_conditionals [17.01] Fix certain aspects of collection reductions in conditionals/repeats. Commit: 41a88de7527c4e5f38070fe31e0dfe78ad817603 https://github.com/galaxyproject/galaxy/commit/41a88de7527c4e5f38070fe31e0df... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-04-04 (Tue, 04 Apr 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-options.js M lib/galaxy/managers/workflows.py M lib/galaxy/tools/actions/__init__.py M static/maps/mvc/ui/ui-options.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-options.js M test/api/test_tools.py A test/functional/tools/identifier_multiple_in_conditional.xml A test/functional/tools/identifier_multiple_in_repeat.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge branch 'release_17.01' into dev Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/5d810d5908ac...41a88de7527c