Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e9e73f4828f7926a1a36654ed48325828992bed3 https://github.com/galaxyproject/galaxy/commit/e9e73f4828f7926a1a36654ed4832... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-choice.js Log Message: ----------- Remove dated comment. Commit: c91a2eb33947a64ed8c03115d1de9ccf746cc195 https://github.com/galaxyproject/galaxy/commit/c91a2eb33947a64ed8c03115d1de9... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/form/form-select-content.js M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/wrappers.py M static/maps/mvc/dataset/dataset-choice.js.map M static/maps/mvc/form/form-select-content.js.map M static/scripts/mvc/form/form-select-content.js M test/api/test_tools.py M test/unit/tools/test_data_parameters.py Log Message: ----------- Multi data parameter improvements. Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools. Rebased original with fixes for rerun of such reductions. Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement. To run the associated API test, execute the following command: ./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data Conflicts: static/maps/mvc/dataset/dataset-choice.js.map static/maps/mvc/form/form-select-content.js.map static/scripts/mvc/form/form-select-content.js Commit: 62a26516cd7a3a6d1ad6441dc8d63efafa25d8d0 https://github.com/galaxyproject/galaxy/commit/62a26516cd7a3a6d1ad6441dc8d63... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M lib/galaxy/tools/actions/__init__.py Log Message: ----------- Fix PR #805 for changes in PR #1153. Commit: 17851ba0ea9572f1c387ff1fea1012b7af737855 https://github.com/galaxyproject/galaxy/commit/17851ba0ea9572f1c387ff1fea101... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M test/unit/tools/test_actions.py Log Message: ----------- And fix unit test for b036adcaa166153e544935c12123877c69a7450f. Commit: d7f5dbe4ca1bc0943e3d3edbddd88d1c226ff5e5 https://github.com/galaxyproject/galaxy/commit/d7f5dbe4ca1bc0943e3d3edbddd88... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-12-05 (Sat, 05 Dec 2015) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-choice.js M client/galaxy/scripts/mvc/form/form-select-content.js M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/wrapped.py M lib/galaxy/tools/wrappers.py M static/maps/mvc/dataset/dataset-choice.js.map M static/maps/mvc/form/form-select-content.js.map M static/scripts/mvc/form/form-select-content.js M test/api/test_tools.py M test/unit/tools/test_actions.py M test/unit/tools/test_data_parameters.py Log Message: ----------- Merge pull request #805 from jmchilton/multi_data_param_enhance Allow multiple collections to be supplied to a multiple data parameter. Compare: https://github.com/galaxyproject/galaxy/compare/b0c1cd7460f1...d7f5dbe4ca1b