Branch: refs/heads/release_17.05 Home: https://github.com/galaxyproject/galaxy Commit: 04bb1e85cd16a04d6968c8d10755bd5e142831b1 https://github.com/galaxyproject/galaxy/commit/04bb1e85cd16a04d6968c8d10755b... Author: John Chilton jmchilton@gmail.com Date: 2017-05-11 (Thu, 11 May 2017)

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

Log Message: ----------- [17.05] Fix FTP upload of multiple files in collection uploader.

Commit: aa1e4cea148ba6a1683d905704191e64ee64a46c https://github.com/galaxyproject/galaxy/commit/aa1e4cea148ba6a1683d905704191... Author: Martin Cech marten@bx.psu.edu Date: 2017-05-11 (Thu, 11 May 2017)

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

Log Message: ----------- Merge pull request #4058 from jmchilton/upload_ftp_fix

[17.05] Fix FTP upload of multiple files in collection uploader.

Compare: https://github.com/galaxyproject/galaxy/compare/9940ae70309a...aa1e4cea148b