Branch: refs/heads/dev 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

Commit: 82e9ce827c9c76b242e52747b7d2d1a546e683a6 https://github.com/galaxyproject/galaxy/commit/82e9ce827c9c76b242e52747b7d2d... Author: guerler aysam.guerler@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M lib/galaxy/tools/parameters/__init__.py

Log Message: ----------- Add tool parameters back to parameters

Commit: ac141397148c0698a06d7d8d2088d94d00961915 https://github.com/galaxyproject/galaxy/commit/ac141397148c0698a06d7d8d2088d... Author: guerler aysam.guerler@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)

Changed paths: M lib/galaxy/tools/parameters/__init__.py

Log Message: ----------- Add blank line

Commit: a889e19af7b5a6b87881a4ade1dad4efae168858 https://github.com/galaxyproject/galaxy/commit/a889e19af7b5a6b87881a4ade1dad... Author: guerler aysam.guerler@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/tools/wrappers.py

Log Message: ----------- Fix parameter wrapping

Commit: 5be5ba753165da5fa1e2cd7c9c1efbed91f79786 https://github.com/galaxyproject/galaxy/commit/5be5ba753165da5fa1e2cd7c9c1ef... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/tools/wrappers.py

Log Message: ----------- Merge pull request #2161 from guerler/fix_wrapper_issue_001

[16.04] Fix wrapper issue, overload __ne__

Commit: 9bb5978d53070363cc83e1f7bf2a1df5f73eaf41 https://github.com/galaxyproject/galaxy/commit/9bb5978d53070363cc83e1f7bf2a1... Author: Nate Coraor nate@bx.psu.edu Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M lib/galaxy/tools/parameters/__init__.py

Log Message: ----------- Merge pull request #2156 from guerler/fix_data_001

[16.04] Add tool parameters back to parameters and expose for certain tools

Commit: 84ef4fd99f602c34ad7de6868864f4d8777ebe23 https://github.com/galaxyproject/galaxy/commit/84ef4fd99f602c34ad7de6868864f... Author: Nate Coraor nate@bx.psu.edu Date: 2016-04-14 (Thu, 14 Apr 2016)

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

Log Message: ----------- Update pulsar-galaxy-lib in pinned-requirements.txt (it was already updated in requirements.txt).

Commit: f013cf2021ec65893dd16bf193bc30182b945047 https://github.com/galaxyproject/galaxy/commit/f013cf2021ec65893dd16bf193bc3... Author: John Chilton jmchilton@gmail.com Date: 2016-04-14 (Thu, 14 Apr 2016)

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

Log Message: ----------- Merge pull request #2164 from natefoo/release_16.04

[16.04] Fix missing pulsar-galaxy-lib update

Commit: a919e98be3ee7a8e289b66efb35c508441f5e7b8 https://github.com/galaxyproject/galaxy/commit/a919e98be3ee7a8e289b66efb35c5... Author: Nate Coraor nate@bx.psu.edu Date: 2016-04-14 (Thu, 14 Apr 2016)

Changed paths: M client/galaxy/scripts/layout/page.js M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/wrappers.py 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.04' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/148d4ee88d29...a919e98be3ee