Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 90b95dc665bd736a21bd16d2852caf5c23bb83c4 https://github.com/galaxyproject/galaxy/commit/90b95dc665bd736a21bd16d2852ca... Author: John Chilton jmchilton@gmail.com Date: 2016-03-31 (Thu, 31 Mar 2016)

Changed paths: M lib/galaxy/dependencies/pinned-requirements.txt

Log Message: ----------- Merge pull request #2043 from martenson/update_mercurial_wheel

[16.01] upgrade mercurial wheel to latest (fixing CVE issues)

Commit: 20f61e6a2f36967e16a92cbcf8ad7f81ca76fb29 https://github.com/galaxyproject/galaxy/commit/20f61e6a2f36967e16a92cbcf8ad7... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-04 (Mon, 04 Apr 2016)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- workaround for error message in case original toolshed had been disabled

Commit: 65a7ebee23364a89d72e528bfcde6b1f6b3c5cd9 https://github.com/galaxyproject/galaxy/commit/65a7ebee23364a89d72e528bfcde6... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-04 (Mon, 04 Apr 2016)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge pull request #2072 from mvdbeek/backport_1738

[16.01] backport #1738

Commit: 2a53be67ad4ac99b6e9fe5fb803bfa44442dbd3c https://github.com/galaxyproject/galaxy/commit/2a53be67ad4ac99b6e9fe5fb803bf... Author: guerler aysam.guerler@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M templates/webapps/galaxy/workflow/run.mako

Log Message: ----------- Show sections in workflow run

Commit: 3002e404ef17cd7db9b817085b2f3ed5a82bd109 https://github.com/galaxyproject/galaxy/commit/3002e404ef17cd7db9b817085b2f3... Author: Eric Rasche rasche.eric@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M templates/webapps/galaxy/workflow/run.mako

Log Message: ----------- Patch in visual separation of section parameters

Commit: 040410b1d3f0ea01374f183ee0b9447e0fc3cefb https://github.com/galaxyproject/galaxy/commit/040410b1d3f0ea01374f183ee0b94... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M templates/webapps/galaxy/workflow/run.mako

Log Message: ----------- Merge pull request #2092 from erasche/workflow-section-backport

[16.01] Workflow section fix backport

Commit: 9ecf99c227466a586a6299e37555655f5ff79a25 https://github.com/galaxyproject/galaxy/commit/9ecf99c227466a586a6299e375556... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-06 (Wed, 06 Apr 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- make dependencies browsable again it would be denied previously as the dependency folder is outside of the repository (symlink protection)

Commit: 0882b4d8fb31752f1fa8c963c3f260f975c918f7 https://github.com/galaxyproject/galaxy/commit/0882b4d8fb31752f1fa8c963c3f26... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-06 (Wed, 06 Apr 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py

Log Message: ----------- use proper method for detecting admin

Commit: 50268cb8ca4a5f812346a71cc640141781f22a3d https://github.com/galaxyproject/galaxy/commit/50268cb8ca4a5f812346a71cc6401... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-07 (Thu, 07 Apr 2016)

Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- fix missing call; add docs and refactor a bit

Commit: 455113d182236a0fec880db296b746a413a8edc4 https://github.com/galaxyproject/galaxy/commit/455113d182236a0fec880db296b74... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-04-08 (Fri, 08 Apr 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Merge pull request #2101 from martenson/fix-browsing-dependencies

[16.01] make dependencies browsable again

Commit: 094580909964c5fad91b1068917832bedaddf579 https://github.com/galaxyproject/galaxy/commit/094580909964c5fad91b106891783... Author: John Chilton jmchilton@gmail.com Date: 2016-04-08 (Fri, 08 Apr 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Merge remote-tracking branch 'upstream/release_16.01' into dev

Commit: f377d069e2aa02434742b3061b2b300c50d6dd86 https://github.com/galaxyproject/galaxy/commit/f377d069e2aa02434742b3061b2b3... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-08 (Fri, 08 Apr 2016)

Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/tool_shed/util/shed_util_common.py

Log Message: ----------- Merge pull request #2115 from jmchilton/dev-merge

Merge release into latest dev.

Compare: https://github.com/galaxyproject/galaxy/compare/ce278630860e...f377d069e2aa