Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 08ed4189a5979f8936b6a4938765e3dcdf4eb759 https://github.com/galaxyproject/galaxy/commit/08ed4189a5979f8936b6a4938765e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-04 (Mon, 04 Feb 2019) Changed paths: M lib/galaxy/webapps/galaxy/controllers/authnz.py Log Message: ----------- Fix oidc login redirection to work with new login component (which simply redirects on successful login, as done here) Commit: 5c5197e84120551b551164f6b73eea2df260a157 https://github.com/galaxyproject/galaxy/commit/5c5197e84120551b551164f6b73ee... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-04 (Mon, 04 Feb 2019) Changed paths: M lib/galaxy/config.py Log Message: ----------- Fix oidc file/backends default location parsing/handling. Commit: 6c9a765b83009869e09e7b7abc39efe5a9d5e843 https://github.com/galaxyproject/galaxy/commit/6c9a765b83009869e09e7b7abc39e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-05 (Tue, 05 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Simple google via oidc login button. Commit: 646fbd63a37a2ab4b9f70541d1109a97e1e66bf9 https://github.com/galaxyproject/galaxy/commit/646fbd63a37a2ab4b9f70541d1109... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-05 (Tue, 05 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue M client/galaxy/scripts/layout/menu.js Log Message: ----------- ODIC tweaks. Google only for now, needs to consume API Commit: a0536889e6a3191fdc87fe0d46cb2cf896971534 https://github.com/galaxyproject/galaxy/commit/a0536889e6a3191fdc87fe0d46cb2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-07 (Thu, 07 Feb 2019) Changed paths: M .gitignore M Makefile A client/galaxy/scripts/components/login/Index.vue M client/galaxy/scripts/components/login/Login.vue A client/galaxy/scripts/components/login/Register.vue M client/galaxy/scripts/entry/admin/AdminRouter.js M client/galaxy/scripts/entry/login/index.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/upload/collection/collection-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/workflow/workflow-terminals.js M config/job_conf.xml.sample_advanced M doc/Makefile R doc/fix_schema_rst.sh M doc/parse_gx_xsd.py M doc/source/admin/apache.md M doc/source/admin/cluster.md M doc/source/admin/config.rst M doc/source/admin/config_logging.rst M doc/source/admin/jobs.md M doc/source/admin/nginx.md M doc/source/admin/production.md M doc/source/admin/scaling.md M doc/source/conf.py M doc/source/releases/16.10.rst M doc/source/releases/17.09_announce.rst R doc/source/slideshow/architecture/galaxy_architecture.md R doc/source/slideshow/architecture/images/backbone-model-view.svg R doc/source/slideshow/architecture/images/cluster_support.svg R doc/source/slideshow/architecture/images/data_managers.svg R doc/source/slideshow/architecture/images/docker-chart.png R doc/source/slideshow/architecture/images/family/team.png R doc/source/slideshow/architecture/images/galaxy_schema.png R doc/source/slideshow/architecture/images/hda.svg R doc/source/slideshow/architecture/images/hda_dataset.plantuml.svg R doc/source/slideshow/architecture/images/hda_dataset.plantuml.txt R doc/source/slideshow/architecture/images/hda_hdca.plantuml.svg R doc/source/slideshow/architecture/images/hda_hdca.plantuml.txt R doc/source/slideshow/architecture/images/jsload.png R doc/source/slideshow/architecture/images/libraries.svg R doc/source/slideshow/architecture/images/library_permissions.svg R doc/source/slideshow/architecture/images/objectstore.plantuml.svg R doc/source/slideshow/architecture/images/objectstore.plantuml.txt R doc/source/slideshow/architecture/images/objectstore_diagram.svg R doc/source/slideshow/architecture/images/plantuml_options.txt R doc/source/slideshow/architecture/images/sequence.json R doc/source/slideshow/architecture/images/server_client.plantuml.svg R doc/source/slideshow/architecture/images/server_client.plantuml.txt R doc/source/slideshow/architecture/images/server_client_old.plantuml.svg R doc/source/slideshow/architecture/images/server_client_old.plantuml.txt R doc/source/slideshow/architecture/images/sqla_arch_small.png R doc/source/slideshow/architecture/images/usegalaxy_webservers.svg R doc/source/slideshow/architecture/images/usegalaxyorg.svg R doc/source/slideshow/architecture/images/webapp.plantuml.svg R doc/source/slideshow/architecture/images/webapp.plantuml.txt R doc/source/slideshow/architecture/images/what-is-webpack.svg R doc/source/slideshow/architecture/images/workflow_definition.svg R doc/source/slideshow/architecture/images/workflow_run.svg R doc/source/slideshow/architecture/images/wsgi_app.svg R doc/source/slideshow/architecture/images/wsgi_request.svg R doc/source/slideshow/architecture/remark-latest.min.js R doc/source/slideshow/architecture/style.css M lib/galaxy/datatypes/sniff.py M lib/galaxy/dependencies/pipfiles/default/Pipfile M lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt M lib/galaxy/managers/configuration.py M lib/galaxy/managers/users.py M lib/galaxy/managers/workflows.py M lib/galaxy/tools/verify/__init__.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/util/compression_utils.py M lib/galaxy/web/proxy/js/package.json M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/tool_shed/controllers/user.py M lib/galaxy/workflow/modules.py M lib/tool_shed/galaxy_install/tools/tool_panel_manager.py M lib/tool_shed/util/xml_util.py R templates/user/register.mako M templates/webapps/tool_shed/common/common.mako M templates/webapps/tool_shed/user/login.mako A templates/webapps/tool_shed/user/register.mako M test/api/test_workflows.py M test/galaxy_selenium/cli.py M test/galaxy_selenium/driver_factory.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml M test/selenium_tests/framework.py M test/selenium_tests/test_registration.py M test/shed_functional/base/twilltestcase.py M test/unit/shed_unit/test_tool_panel_manager.py M test/unit/tools/test_toolbox.py M test/unit/workflows/test_modules.py M test/unit/workflows/workflow_support.py M tool-data/intermine_simple_display.loc.sample Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into fix_oidc_login_redirect Commit: 9551272a8439c434974734a45e47d1debc8bd92a https://github.com/galaxyproject/galaxy/commit/9551272a8439c434974734a45e47d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-07 (Thu, 07 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue M client/galaxy/scripts/components/login/Register.vue Log Message: ----------- Cleanup. Commit: 08f1fc1c2346fb58d8f724d3a915e85665bc20d9 https://github.com/galaxyproject/galaxy/commit/08f1fc1c2346fb58d8f724d3a915e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-11 (Mon, 11 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Standardize to lowercase link for google authnz login endpoint Commit: ff31f09b9ec06e3674d2f5ca677da6fcaf6d5037 https://github.com/galaxyproject/galaxy/commit/ff31f09b9ec06e3674d2f5ca677da... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-11 (Mon, 11 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Drop stray debug Commit: 370a8ce03e91729493d01aea48cc9ecb6632fc0c https://github.com/galaxyproject/galaxy/commit/370a8ce03e91729493d01aea48cc9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-11 (Mon, 11 Feb 2019) Changed paths: M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/controllers/authnz.py M lib/galaxy/webapps/galaxy/controllers/root.py Log Message: ----------- JSApp refactoring; set up authnz controller to be able to serve a full client on the auth callback. Commit: ba39f2cc86a770822aaa3d43ae1eaceea1ce5471 https://github.com/galaxyproject/galaxy/commit/ba39f2cc86a770822aaa3d43ae1ea... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-14 (Thu, 14 Feb 2019) Changed paths: M lib/galaxy/webapps/galaxy/controllers/authnz.py Log Message: ----------- Fix documented route for non-api authnz controller. Commit: 78c94660ca9505099f2d90842c4f185e4d1ac008 https://github.com/galaxyproject/galaxy/commit/78c94660ca9505099f2d90842c4f1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-14 (Thu, 14 Feb 2019) Changed paths: M lib/galaxy/webapps/galaxy/controllers/authnz.py Log Message: ----------- Drop cruft from refactoring. Commit: 945c317db8499ad143dc1165f9e993cad864e8c4 https://github.com/galaxyproject/galaxy/commit/945c317db8499ad143dc1165f9e99... Author: John Chilton <jmchilton@gmail.com> Date: 2019-02-15 (Fri, 15 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue M client/galaxy/scripts/components/login/Register.vue M lib/galaxy/config.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/controllers/authnz.py M lib/galaxy/webapps/galaxy/controllers/root.py Log Message: ----------- Merge pull request #7347 from dannon/fix_oidc_login_redirect Overhaul OIDC login handling Compare: https://github.com/galaxyproject/galaxy/compare/11bbcfa87d01...945c317db849