Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: bf5414d7e037e37de3c5df87649e3ebef0f2a21f https://github.com/galaxyproject/galaxy/commit/bf5414d7e037e37de3c5df87649e3... Author: guerler aysam.guerler@gmail.com Date: 2019-01-17 (Thu, 17 Jan 2019)

Changed paths: M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js

Log Message: ----------- Use es6 literal for library toolbar header, use icon buttons, left align

Commit: 8702d671a8250fb67d49a76ae72b4a50e675bc43 https://github.com/galaxyproject/galaxy/commit/8702d671a8250fb67d49a76ae72b4... Author: guerler aysam.guerler@gmail.com Date: 2019-01-17 (Thu, 17 Jan 2019)

Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js

Log Message: ----------- Use es6 for library folder template, align toolbar appearance with library list view

Commit: 3caa59634a22850d0b12ae7556d5bc52e58b11f3 https://github.com/galaxyproject/galaxy/commit/3caa59634a22850d0b12ae7556d5b... Author: guerler aysam.guerler@gmail.com Date: 2019-01-17 (Thu, 17 Jan 2019)

Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js

Log Message: ----------- Revise history export button

Commit: b44f8475806f0379fa8a0d4443bd94262da6e24d https://github.com/galaxyproject/galaxy/commit/b44f8475806f0379fa8a0d4443bd9... Author: guerler aysam.guerler@gmail.com Date: 2019-01-22 (Tue, 22 Jan 2019)

Changed paths: A client/galaxy/scripts/components/login/Login.vue A client/galaxy/scripts/components/login/Password.vue R client/galaxy/scripts/entry/login/LoginPage.js M client/galaxy/scripts/entry/login/index.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/collection/rules-input-view.js M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/workflow/workflow-manager.js M client/galaxy/style/scss/overrides.scss M client/galaxy/style/scss/upload.scss M config/job_conf.xml.sample_advanced M lib/galaxy/actions/library.py M lib/galaxy/auth/__init__.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/genetics.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/exceptions/__init__.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/security/validate_user_input.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/controllers/user.py M lib/galaxy/workflow/modules.py M scripts/common_startup.sh R templates/user/info.mako R templates/user/login.mako R templates/user/reset_password.mako M templates/webapps/tool_shed/base_panels.mako M templates/webapps/tool_shed/user/change_password.mako M templates/webapps/tool_shed/user/index.mako A templates/webapps/tool_shed/user/login.mako M templates/webapps/tool_shed/user/manage_info.mako A templates/webapps/tool_shed/user/reset_password.mako M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/selenium_tests/test_login.py M test/shed_functional/base/twilltestcase.py M test/unit/managers/test_HDAManager.py M test/unit/managers/test_UserManager.py M test/unit/unittest_utils/galaxy_mock.py M tools/data_source/data_source.py

Log Message: ----------- Merge branch 'dev' into library_fix

Commit: b5ec33230fffb964d7fbf12ff47b96dddf617a02 https://github.com/galaxyproject/galaxy/commit/b5ec33230fffb964d7fbf12ff47b9... Author: guerler aysam.guerler@gmail.com Date: 2019-01-30 (Wed, 30 Jan 2019)

Changed paths: M .ci/jenkins/selenium-py3/run_tests.sh M .ci/jenkins/selenium/run_tests.sh M .gitignore M client/galaxy/scripts/components/RuleCollectionBuilder.vue M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folderrow-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-libraryrow-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/rules/rule-definitions.js M client/galaxy/scripts/toolshed/groups/group-detail-view.js M config/galaxy.yml.sample M config/tool_shed.yml.sample M doc/source/admin/authentication.md M doc/source/admin/cluster.md M doc/source/admin/config.rst M doc/source/admin/galaxy_options.rst R doc/source/lib/galaxy.openid.rst M doc/source/lib/galaxy.rst M doc/source/lib/galaxy.web.framework.rst M lib/galaxy/config.py M lib/galaxy/datatypes/isa.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt M lib/galaxy/jobs/runners/drmaa.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/jobs.py M lib/galaxy/model/__init__.py M lib/galaxy/util/__init__.py M lib/galaxy/util/filelock.py M lib/galaxy/webapps/galaxy/api/authenticate.py M lib/galaxy/webapps/galaxy/api/libraries.py M lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/config_schema.yml M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/workflow/modules.py M run_tests.sh M templates/user/logout.mako M test/api/test_histories.py M test/unit/test_utils.py M tools/filters/sff_extract.py

Log Message: ----------- Merge branch 'dev' into library_fix

Commit: 88724a2d9cd1e3081d0e6c2e5010f63c092dfe36 https://github.com/galaxyproject/galaxy/commit/88724a2d9cd1e3081d0e6c2e5010f... Author: guerler aysam.guerler@gmail.com Date: 2019-02-04 (Mon, 04 Feb 2019)

Changed paths: M .travis.yml M config/datatypes_conf.xml.sample M cron/add_manual_builds.py M lib/galaxy/actions/library.py M lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt M lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt M lib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt M lib/galaxy/jobs/dynamic_tool_destination.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/managers/jobs.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/meta.py M lib/galaxy/tools/verify/__init__.py M lib/galaxy/tools/verify/interactor.py M lib/galaxy/util/hash_util.py M lib/galaxy/webapps/galaxy/api/toolshed.py M scripts/check_python.py M templates/webapps/galaxy/workflow/display.mako M test/api/test_workflows.py M test/functional/test_toolbox.py M test/galaxy_selenium/cli.py M test/galaxy_selenium/driver_factory.py M test/galaxy_selenium/navigates_galaxy.py M test/selenium_tests/framework.py M tools/maf/maf_to_bed.py M tools/phenotype_association/senatag.py M tools/stats/gsummary.py M tox.ini

Log Message: ----------- Merge branch 'dev' into library_fix

Commit: 415444d31028ad650967cd100862c1a3262818c8 https://github.com/galaxyproject/galaxy/commit/415444d31028ad650967cd100862c... Author: Martin Cech marten@bx.psu.edu Date: 2019-02-06 (Wed, 06 Feb 2019)

Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js

Log Message: ----------- Merge pull request #7234 from guerler/library_fix

Use es6 literal for library toolbar header, use icon buttons, left align

Compare: https://github.com/galaxyproject/galaxy/compare/2ec2933e0ebb...415444d31028