Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2ecc26d83a517ac7e7452a50d84e9b96e1a9e8af https://github.com/galaxyproject/galaxy/commit/2ecc26d83a517ac7e7452a50d84e9... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/config.py M templates/base/base_panels.mako

Log Message: ----------- remove unused config; clarify sample; provide default for inactive message

Commit: c223ebff6dff348acfe70d329657fc71fef605d1 https://github.com/galaxyproject/galaxy/commit/c223ebff6dff348acfe70d329657f... Author: Martin Cech cech.marten@gmail.com Date: 2016-07-27 (Wed, 27 Jul 2016)

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

Log Message: ----------- explicitly disable activation for TS because inherited user controller wants the property

Commit: e625eed9c57502996b3f5caa83060bdf001bcada https://github.com/galaxyproject/galaxy/commit/e625eed9c57502996b3f5caa83060... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-07-27 (Wed, 27 Jul 2016)

Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/config.py M templates/base/base_panels.mako

Log Message: ----------- Merge pull request #2158 from martenson/improve-activation

activation config touch

Compare: https://github.com/galaxyproject/galaxy/compare/3440334694cf...e625eed9c575