diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-22 13:50:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 13:50:11 +0100 |
| commit | ad1a026e547d2092783e545f854ea34065d0bdb2 (patch) | |
| tree | 1a96cc605df6ab3ab5b07ecf4c3bc01074edf8a5 /settings/src | |
| parent | db6fad3eeea0137c091e505f6c93bad55d105b99 (diff) | |
| parent | c95ef8534efd0e2a9950fa354f8ab1872e73c389 (diff) | |
| download | nextcloud-server-ad1a026e547d2092783e545f854ea34065d0bdb2.tar.gz nextcloud-server-ad1a026e547d2092783e545f854ea34065d0bdb2.zip | |
Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanation
Add explanatory text to admin twofactor settings
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/AdminTwoFactor.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/settings/src/components/AdminTwoFactor.vue b/settings/src/components/AdminTwoFactor.vue index 1e0f3403ba0..5feaa75af21 100644 --- a/settings/src/components/AdminTwoFactor.vue +++ b/settings/src/components/AdminTwoFactor.vue @@ -50,6 +50,12 @@ </Multiselect> </p> <p> + <em> + <!-- this text is also found in the documentation. update it there as well if it ever changes --> + {{ t('settings', 'When groups are selected/excluded, they use the following logic to determine if a user has 2FA enforced: If no groups are selected, 2FA is enabled for everyone except members of the excluded groups. If groups are selected, 2FA is enabled for all members of these. If a user is both in a selected and excluded group, the selected takes precedence and 2FA is enforced.') }} + </em> + </p> + <p> <button class="button primary" v-on:click="saveChanges" :disabled="loading"> |