Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: 7a4be88693d8541827cf47f8d7dd3989eef84ef7 https://github.com/galaxyproject/galaxy/commit/7a4be88693d8541827cf47f8d7dd3... Author: Martin Cech cech.marten@gmail.com Date: 2015-11-25 (Wed, 25 Nov 2015)

Changed paths: M lib/galaxy/webapps/tool_shed/config.py

Log Message: ----------- fix missing configuration; broke TS password reset

Commit: aa52b6cff1d4b694a96a1b37da263a72cbd3a726 https://github.com/galaxyproject/galaxy/commit/aa52b6cff1d4b694a96a1b37da263... Author: Martin Cech cech.marten@gmail.com Date: 2015-11-25 (Wed, 25 Nov 2015)

Changed paths: M config/tool_shed.ini.sample

Log Message: ----------- add pretty_datetime_format to TS config sample

Commit: d89670e939d86e6b57988fe14c5695f457b751e2 https://github.com/galaxyproject/galaxy/commit/d89670e939d86e6b57988fe14c569... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2015-11-25 (Wed, 25 Nov 2015)

Changed paths: M config/tool_shed.ini.sample M lib/galaxy/webapps/tool_shed/config.py

Log Message: ----------- Merge pull request #1170 from martenson/fix-password-reset

[15.10] fix missing configuration which broke TS password reset

Compare: https://github.com/galaxyproject/galaxy/compare/82ce6244653f...d89670e939d8