Merge branch 'main' into feature/login-improvements

# Conflicts:
#	src/components/misc/no-auth-wrapper.vue
#	src/styles/components/_index.scss
#	src/views/user/Login.vue
#	src/views/user/Register.vue
This commit is contained in:
kolaente 2022-01-08 13:44:35 +01:00
commit 310578d349
Signed by untrusted user who does not match committer: konrad
GPG key ID: F40E70337AB24C9B
93 changed files with 1761 additions and 2501 deletions

View file

@ -85,7 +85,7 @@
@click="redirectToProvider(p)"
v-for="(p, k) in openidConnect.providers"
:key="k"
type="secondary"
variant="secondary"
class="is-fullwidth mt-2"
>
{{ $t('user.auth.loginWith', {provider: p.name}) }}