Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f00fb3e4add155268aaf7e17228699734b0bfeab https://github.com/galaxyproject/galaxy/commit/f00fb3e4add155268aaf7e1722869... Author: guerler <aysam.guerler@gmail.com> Date: 2019-02-21 (Thu, 21 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Place oidc login button under regular login form Commit: 87261f625368f55b2d7ba7aa1711fd462e2afcb6 https://github.com/galaxyproject/galaxy/commit/87261f625368f55b2d7ba7aa1711f... Author: guerler <aysam.guerler@gmail.com> Date: 2019-02-21 (Thu, 21 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Hide oidc options based on config setting Commit: 61a5c3b14f7e606b7d0513b2ae1cec3acf6b75b0 https://github.com/galaxyproject/galaxy/commit/61a5c3b14f7e606b7d0513b2ae1ce... Author: guerler <aysam.guerler@gmail.com> Date: 2019-02-21 (Thu, 21 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Use lower-case galaxy local variable name Commit: 66b01d2b32181b6ae526f90e0c4cbde85f19c4c3 https://github.com/galaxyproject/galaxy/commit/66b01d2b32181b6ae526f90e0c4cb... Author: guerler <aysam.guerler@gmail.com> Date: 2019-02-21 (Thu, 21 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue Log Message: ----------- Avoid computing oidc setting Commit: 2a05323daa84db46479f5ee9ca756dba51da45e7 https://github.com/galaxyproject/galaxy/commit/2a05323daa84db46479f5ee9ca756... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-22 (Fri, 22 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue M client/galaxy/scripts/entry/panels/tool-panel.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/user/user-model.js Log Message: ----------- Client formatting. Commit: 830c21d6f5ef34e4ddce498b2c02c9c4ae7ff027 https://github.com/galaxyproject/galaxy/commit/830c21d6f5ef34e4ddce498b2c02c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2019-02-22 (Fri, 22 Feb 2019) Changed paths: M client/galaxy/scripts/components/login/Login.vue M client/galaxy/scripts/entry/panels/tool-panel.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/user/user-model.js Log Message: ----------- Merge branch 'move_google_login_button' into dev Compare: https://github.com/galaxyproject/galaxy/compare/c53fb623d8cf...830c21d6f5ef