Skip to content
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

Rename "remote" to "federated" in share list #30220

Merged
merged 1 commit into from
Jan 22, 2018
Merged

Rename "remote" to "federated" in share list #30220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/js/sharedialogshareelistview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
if (shareType === OC.Share.SHARE_TYPE_GROUP) {
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'federated') + ')';
}

return _.extend(hasPermissionOverride, {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/features/bootstrap/SharingContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private function addToListOfCreatedPublicLinks($name, $url) {
}

/**
* @Given /^the (?:file|folder) "([^"]*)" is shared with the (?:(remote)\s)?user "([^"]*)"$/
* @Given /^the (?:file|folder) "([^"]*)" is shared with the (?:(remote|federated)\s)?user "([^"]*)"$/
* @param string $folder
* @param string $remote
* @param string $user
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/features/sharingExternalOther/federationSharing.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ So that other users have access to these files
@skipOnMICROSOFTEDGE
Scenario: share a folder with an remote user and prohibit deleting
When the folder "simple-folder" is shared with the remote user "user1@%remote_server%"
And the sharing permissions of "user1@%remote_server% (remote)" for "simple-folder" are set to
And the sharing permissions of "user1@%remote_server% (federated)" for "simple-folder" are set to
| delete | no |
And I relogin with username "user1" and password "1234" to "http://%remote_server%"
And the offered remote shares are accepted
Expand Down