Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 2ebe9405106dfc16504e3b6f775425634bb4691f https://github.com/galaxyproject/galaxy/commit/2ebe9405106dfc16504e3b6f77542... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-12 (Tue, 12 Apr 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.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/layout/page.js
Log Message: ----------- load options from config, not from options
Commit: ad952a4b8d7501d0df48e44d7c966ff22f9a63c4 https://github.com/galaxyproject/galaxy/commit/ad952a4b8d7501d0df48e44d7c966... Author: carlfeberhard carlfeberhard@users.noreply.github.com Date: 2016-04-12 (Tue, 12 Apr 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.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/layout/page.js
Log Message: ----------- Merge pull request #2139 from martenson/fix-inactivity
[16.01] load options from config, not from options
Compare: https://github.com/galaxyproject/galaxy/compare/fe4afefc42a4...ad952a4b8d75