Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c315f1d74bc8b4c4c2e5d6f0d4acd02d64b89e43 https://github.com/galaxyproject/galaxy/commit/c315f1d74bc8b4c4c2e5d6f0d4acd... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Upload file escaping backport. Commit: 602f2f2f1d431306c9aa64a6818c8feddaabb261 https://github.com/galaxyproject/galaxy/commit/602f2f2f1d431306c9aa64a6818c8... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js Log Message: ----------- Merge pull request #3292 from dannon/backport_upload_fn_escape [16.07] Upload file escaping backport. Commit: d6d2a12ec071e6cfa297944917ed201895f56332 https://github.com/galaxyproject/galaxy/commit/d6d2a12ec071e6cfa297944917ed2... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge branch 'release_16.07' into release_16.10 Conflicts: client/galaxy/scripts/mvc/upload/composite/composite-row.js client/galaxy/scripts/mvc/upload/default/default-row.js static/maps/mvc/upload/composite/composite-row.js.map static/maps/mvc/upload/default/default-row.js.map 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 static/scripts/bundled/login.bundled.js.map static/scripts/mvc/upload/composite/composite-row.js static/scripts/mvc/upload/default/default-row.js Commit: 06de9d0ae060318244c0c9b653e31058ddd826a7 https://github.com/galaxyproject/galaxy/commit/06de9d0ae060318244c0c9b653e31... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge branch 'release_16.10' into dev Conflicts: static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Compare: https://github.com/galaxyproject/galaxy/compare/95305a3ee2bf...06de9d0ae060