Skip to content

feat: Reword login form disabled warning #37949 #37953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Mar 19, 2024
Merged

feat: Reword login form disabled warning #37949 #37953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ce590
feat: Reword login form disabled warning #37949
moan0s Apr 27, 2023
d397dd6
chore: Add changed binaries
moan0s Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/src/views/Login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</template>
</div>
<div v-else-if="!loading && passwordlessLogin"
key="reset"
key="reset-pw-less"
class="login-additional login-passwordless">
<PasswordLessLoginForm :username.sync="user"
:redirect-url="redirectUrl"
Expand All @@ -83,7 +83,7 @@
</NcButton>
</div>
<div v-else-if="!loading && canResetPassword"
key="reset"
key="reset-can-reset"
class="login-additional">
<div class="lost-password-container">
<ResetPassword v-if="resetPassword"
Expand All @@ -101,8 +101,8 @@
</template>
<template v-else>
<transition name="fade" mode="out-in">
<NcNoteCard type="warning" :title="t('core', 'Login form is disabled.')">
{{ t('core', 'Please contact your administrator.') }}
<NcNoteCard type="info" :title="t('core', 'Login form is disabled.')">
{{ t('core', 'The Nextcloud login form is disabled. Use another login option if available or contact your administration.') }}
</NcNoteCard>
</transition>
</template>
Expand Down
4 changes: 2 additions & 2 deletions dist/core-login.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-login.js.map
View file
Open in desktop

Large diffs are not rendered by default.