Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9af36bd13b90eea2f2883ab623a4a60ccf58a8b8 https://github.com/galaxyproject/galaxy/commit/9af36bd13b90eea2f2883ab623a4a... Author: Jelle Scholtalbers j.scholtalbers@gmail.com Date: 2017-06-28 (Wed, 28 Jun 2017)

Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/admin.bundled.js.map 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/bundled/login.bundled.js.map M static/scripts/layout/menu.js

Log Message: ----------- change 'register or login' to just 'login' if 'allow_user_creation=False'

Commit: 010beb8270bddbddcbf4712c6466cd9831cd2ae3 https://github.com/galaxyproject/galaxy/commit/010beb8270bddbddcbf4712c6466c... Author: Jelle Scholtalbers j.scholtalbers@gmail.com Date: 2017-07-04 (Tue, 04 Jul 2017)

Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js

Log Message: ----------- code optimization - reuse userTab variable

Commit: 7ce50a8ff72424ffb3403f6026ba4ada9bc32ba3 https://github.com/galaxyproject/galaxy/commit/7ce50a8ff72424ffb3403f6026ba4... Author: John Chilton jmchilton@gmail.com Date: 2017-07-04 (Tue, 04 Jul 2017)

Changed paths: M CONTRIBUTING.md A SECURITY_POLICY.md M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M config/datatypes_conf.xml.sample M doc/source/project/organization.rst M lib/galaxy/app.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/plant_tribes.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/1.ptkscmp M lib/galaxy/managers/collections.py M lib/galaxy/managers/tags.py M lib/galaxy/model/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/jobs.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/tool/tool-form-base.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/tool/tool-form-base.js R templates/webapps/galaxy/history/shared_grid.mako M test/unit/unittest_utils/galaxy_mock.py

Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into login_only

Compare: https://github.com/galaxyproject/galaxy/compare/ac59d1d6e042...7ce50a8ff724