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

Merge pull request #26366 from nextcloud/backport/26355/stable21 

[stable21] Fix working for phone number integration
This commit is contained in:
Joas Schilling 2021-03-30 09:53:48 +02:00 committed by GitHub
parent 68e9013c39 2b8dfc03b6
commit 3ebe3a0e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/settings/js/federationscopemenu.js
View File

@ -30,14 +30,14 @@
{ {
name: 'v2-private', name: 'v2-private',
displayName: t('settings', 'Private'), displayName: t('settings', 'Private'),
tooltip: t('settings', "Don't show via public link"), tooltip: t('settings', 'Only visible to people matched via phone number integration through Talk on mobile'),
iconClass: 'icon-password', iconClass: 'icon-phone',
active: false active: false
}, },
{ {
name: 'v2-local', name: 'v2-local',
displayName: t('settings', 'Local'), displayName: t('settings', 'Local'),
tooltip: t('settings', "Don't synchronize to servers"), tooltip: t('settings', 'Only visible to people on this instance and guests'),
iconClass: 'icon-password', iconClass: 'icon-password',
active: false active: false
}, },

4
apps/settings/templates/settings/admin/sharing.php
View File

@ -183,12 +183,12 @@
<?php if ($_['restrictUserEnumerationToPhone'] === 'yes') { <?php if ($_['restrictUserEnumerationToPhone'] === 'yes') {
print_unescaped('checked="checked"'); print_unescaped('checked="checked"');
} ?> /> } ?> />
<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches'));?></label><br /> <label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phone number integration'));?></label><br />
</p> </p>
<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') { <p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
p('hidden'); p('hidden');
}?>"> }?>">
<em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.'));?></em><br /> <em><?php p($l->t('If autocompletion "same group" and "phone number integration" are enabled a match in either is enough to show the user.'));?></em><br />
</p> </p>
<p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') { <p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
p('hidden'); p('hidden');