github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-23 06:45:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge remote-tracking branch 'upstream/mealie-next' into pr/mrth2/5184

Browse source
This commit is contained in:
Michael Genson 2025-05-29 19:55:40 +00:00
commit e2e5c89753
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/pages/login.vue
View file

@ -95,6 +95,7 @@
@click:append-inner="togglePasswordShow" @click:append-inner="togglePasswordShow"
/> />
<v-checkbox <v-checkbox
v-if="allowPasswordLogin"
v-model="form.remember" v-model="form.remember"
class="ml-2 mt-n2" class="ml-2 mt-n2"
:label="$t('user.remember-me')" :label="$t('user.remember-me')"
@ -118,7 +119,7 @@
</v-card-actions> </v-card-actions>
<div <div
v-if="allowOidc" v-if="allowOidc && allowPasswordLogin"
class="d-flex my-4 justify-center align-center" class="d-flex my-4 justify-center align-center"
width="80%" width="80%"
> >
@ -156,7 +157,7 @@
</v-card-text> </v-card-text>
<v-card-actions class="d-flex justify-center flex-column flex-sm-row"> <v-card-actions class="d-flex justify-center flex-column flex-sm-row">
<v-btn <v-btn
v-if="allowSignup" v-if="allowSignup && allowPasswordLogin"
variant="text" variant="text"
to="/register" to="/register"
> >
@ -170,6 +171,7 @@
{{ $t("user.invite-only") }} {{ $t("user.invite-only") }}
</v-btn> </v-btn>
<v-btn <v-btn
v-if="allowPasswordLogin"
class="mr-auto" class="mr-auto"
variant="text" variant="text"
to="/forgot-password" to="/forgot-password"