mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanation 

Add explanatory text to admin twofactor settings
This commit is contained in:
Morris Jobke 2018-11-22 13:50:11 +01:00 committed by GitHub
parent db6fad3eee c95ef8534e
commit ad1a026e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/js/4.js.map
View File

File diff suppressed because one or more lines are too long

2
settings/js/5.js.map
View File

File diff suppressed because one or more lines are too long

12
settings/js/settings-admin-security.js
View File

File diff suppressed because one or more lines are too long

2
settings/js/settings-admin-security.js.map
View File

File diff suppressed because one or more lines are too long

2
settings/js/settings-vue.js.map
View File

File diff suppressed because one or more lines are too long

6
settings/src/components/AdminTwoFactor.vue
View File

@ -49,6 +49,12 @@
:close-on-select="false"> :close-on-select="false">
</Multiselect> </Multiselect>
</p> </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> <p>
<button class="button primary" <button class="button primary"
v-on:click="saveChanges" v-on:click="saveChanges"