Branch: refs/heads/usegalaxy Home: https://github.com/galaxyproject/galaxy Commit: 12eb3838496f373e429235cd8e75117baf682005 https://github.com/galaxyproject/galaxy/commit/12eb3838496f373e429235cd8e751... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths: M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- fix xss thanks to @erasche
Commit: 2528a89bd087786c458c86d6ac78c24e8fb7f51d https://github.com/galaxyproject/galaxy/commit/2528a89bd087786c458c86d6ac78c... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths: M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- Merge pull request #3776 from martenson/xss-fix
[16.04] fix xss vuln in grids
Commit: e3255fd3cb7c1b0cf9ce9fa82f0a4a9c39719f19 https://github.com/galaxyproject/galaxy/commit/e3255fd3cb7c1b0cf9ce9fa82f0a4... Author: nekrut anton@nekrut.org Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/tools/filter_failed_collection.xml M lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/merge_collection.xml M lib/galaxy/tools/unzip_collection.xml M lib/galaxy/tools/zip_collection.xml
Log Message: ----------- made collection ops help sections slightly more readable
Commit: d9c3a0bb57e63a1849bb3f55c056ae0384a2279a https://github.com/galaxyproject/galaxy/commit/d9c3a0bb57e63a1849bb3f55c056a... Author: Anton Nekrutenko anekrut@gmail.com Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/tools/unzip_collection.xml
Log Message: ----------- Update unzip_collection.xml
fixed typos identified by @mvdbeek
Commit: 80ecc79a4cb8fa3dbaf9b3348216df6f9387a91c https://github.com/galaxyproject/galaxy/commit/80ecc79a4cb8fa3dbaf9b3348216d... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- Merge pull request #3789 from galaxyproject/release_16.04
merge 16.04 into 16.07
Commit: 490e565611b5e3a22124d937e22cf0363afb62f6 https://github.com/galaxyproject/galaxy/commit/490e565611b5e3a22124d937e22cf... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- Merge pull request #3790 from galaxyproject/release_16.07
merge 16.07 into 16.10
Commit: ec88dda1e9c926341b87bc7e19b7b5842eb92ddb https://github.com/galaxyproject/galaxy/commit/ec88dda1e9c926341b87bc7e19b7b... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- Merge pull request #3791 from galaxyproject/release_16.10
merge 16.10 into 17.01
Commit: c84b3ba0b8f9de983d43ea17c165856d23960911 https://github.com/galaxyproject/galaxy/commit/c84b3ba0b8f9de983d43ea17c1658... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/tools/filter_failed_collection.xml M lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/merge_collection.xml M lib/galaxy/tools/unzip_collection.xml M lib/galaxy/tools/zip_collection.xml
Log Message: ----------- Merge pull request #3788 from jmchilton/backport_collection_option_help_fixes
[17.01] Backport collection operation help fixes
Commit: f9b8e6a51a179a0c41e1657e1b9eb92e017a0a1a https://github.com/galaxyproject/galaxy/commit/f9b8e6a51a179a0c41e1657e1b9eb... Author: Martin Cech marten@bx.psu.edu Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths: M lib/galaxy/tools/filter_failed_collection.xml M lib/galaxy/tools/flatten_collection.xml M lib/galaxy/tools/merge_collection.xml M lib/galaxy/tools/unzip_collection.xml M lib/galaxy/tools/zip_collection.xml M lib/galaxy/web/framework/helpers/grids.py
Log Message: ----------- Merge pull request #3792 from galaxyproject/release_17.01
[usegalaxy] merge 17.01
Compare: https://github.com/galaxyproject/galaxy/compare/3b4cf0d578d8...f9b8e6a51a17
galaxy-commits@lists.galaxyproject.org