Branch: refs/heads/release_16.04 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
Commit: 1e3b3a15581ecd62e78999f6be9e74d9e7cfbc65 https://github.com/galaxyproject/galaxy/commit/1e3b3a15581ecd62e78999f6be9e7... 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/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js
Log Message: ----------- fix the value passed to Masthead as options were options.config before
Commit: 87dbfeeabd03d4b7f7c81b3e9dfadf3890f71b95 https://github.com/galaxyproject/galaxy/commit/87dbfeeabd03d4b7f7c81b3e9dfad... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-13 (Wed, 13 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 branch 'release_16.01' into release_16.04
Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map
Commit: 4c2bca51171efff42e2852bfa59a91d5acee3e73 https://github.com/galaxyproject/galaxy/commit/4c2bca51171efff42e2852bfa59a9... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.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 #2141 from martenson/fix-sideeffect
[16.01] fix the value passed to Masthead as options were options.config before
Commit: 090e0d33561702b85c82c1bfb228b699c30804ea https://github.com/galaxyproject/galaxy/commit/090e0d33561702b85c82c1bfb228b... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Log Message: ----------- Merge branch 'release_16.01' into merge01to04
Commit: d5cc3571704d5fe3927d070456f5b934e9f5e1cf https://github.com/galaxyproject/galaxy/commit/d5cc3571704d5fe3927d070456f5b... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-13 (Wed, 13 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 #2150 from martenson/merge01to04
[16.04] Merge 16.01 to 16.04
Compare: https://github.com/galaxyproject/galaxy/compare/f03c0375566a...d5cc3571704d