Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a5c75d2f954f697497747412fd2a998fa61019b0 https://github.com/galaxyproject/galaxy/commit/a5c75d2f954f697497747412fd2a9... Author: Bjoern Gruening bjoern.gruening@gmail.com Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths: M lib/galaxy/tools/parameters/grouping.py
Log Message: ----------- Correct access for FTP files in composite datatype
Commit: 3ab2afb5e5bd82b3aa89500b9c2f80913a054316 https://github.com/galaxyproject/galaxy/commit/3ab2afb5e5bd82b3aa89500b9c2f8... Author: Anthony Bretaudeau anthony.bretaudeau@inria.fr Date: 2018-04-23 (Mon, 23 Apr 2018)
Changed paths: M lib/galaxy/tools/data_manager/manager.py
Log Message: ----------- backport move_merge fix from #5922
Commit: 88bf6bbdaa2d15355192eb3c9087151f7712209d https://github.com/galaxyproject/galaxy/commit/88bf6bbdaa2d15355192eb3c90871... Author: Martin Cech marten@bx.psu.edu Date: 2018-04-24 (Tue, 24 Apr 2018)
Changed paths: M lib/galaxy/tools/parameters/grouping.py
Log Message: ----------- Merge pull request #5943 from erasche/fix-ftp-composite-upload
[18.01] Correct access for FTP files in composite datatype
Commit: 20e9934bc5922f8d20dd31540a4dce9086495832 https://github.com/galaxyproject/galaxy/commit/20e9934bc5922f8d20dd31540a4dc... Author: John Chilton jmchilton@gmail.com Date: 2018-04-24 (Tue, 24 Apr 2018)
Changed paths: M lib/galaxy/tools/data_manager/manager.py
Log Message: ----------- Merge pull request #5958 from abretaud/movemerge1801
[18.01] Backport to 18.01 the move_merge fix from #5922
Commit: c1e5fb82901600bd109fba133bc0f7c62313b3ea https://github.com/galaxyproject/galaxy/commit/c1e5fb82901600bd109fba133bc0f... Author: Martin Cech marten@bx.psu.edu Date: 2018-04-25 (Wed, 25 Apr 2018)
Changed paths: M lib/galaxy/tools/parameters/grouping.py
Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.01' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/1624b6ce7d38...c1e5fb829016