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.

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 'server-to-server sharing' to 'federated cloud' #13728

Merged
merged 1 commit into from
Jan 29, 2015

Conversation

schiessle
Copy link
Contributor

as discussed

cc @karlitschek @MTRichards

@DeepDiver1975 DeepDiver1975 added this to the 8.0-current milestone Jan 28, 2015
@@ -34,7 +34,7 @@ class Server2Server {
public function createShare($params) {

if (!$this->isS2SEnabled(true)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See also #12454 and the original PR where that was introduced where I pointed that explicitly out. The part with "Custom middlewares are not possible" ;-)

@karlitschek
Copy link
Contributor

Great. Thanks 👍

@@ -34,7 +34,7 @@ class Server2Server {
public function createShare($params) {

if (!$this->isS2SEnabled(true)) {
return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
return new \OC_OCS_Result(null, 503, 'Server does not support cloud federation');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it missing the "sharing"?

@icewind1991
Copy link
Contributor

I think the error messages should stay as they are, "cloud federation" tells me nothing as a user but some buzzwords while "server to server sharing" is hard to misunderstand.

A header for the settings it's fine since it's 1) only exposed to admins, 2) the settings themselves still mention sharing.

@MTRichards
Copy link
Contributor

In this case, the message should be "Federated Cloud sharing"
instead of Cloud Federation.

The error and the admin settings need to line up so that an admin can solve the problem easily.
"Aha, a sharing problem! let me go look for the section to enable that"

They should be the same...

@@ -4,7 +4,7 @@
?>
<div class="section" id="fileSharingSettings" >

<h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
<h2><?php p($l->t('Federated Cloud'));?></h2>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Federated Cloud Sharing here aswell?

@PVince81
Copy link
Contributor

@schiesbn can you make the change ?

@MorrisJobke
Copy link
Contributor

I fixed it. I'm fine with that change 👍

@ghost
Copy link

ghost commented Jan 29, 2015

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/8299/
🚀 Test PASSed. 🚀

@DeepDiver1975
Copy link
Member

let's ship it then 👍

DeepDiver1975 added a commit that referenced this pull request Jan 29, 2015
rename 'server-to-server sharing' to 'federated cloud'
@DeepDiver1975 DeepDiver1975 merged commit 5c8e5e2 into master Jan 29, 2015
@DeepDiver1975 DeepDiver1975 deleted the federated_cloud branch January 29, 2015 14:54
@scrutinizer-notifier
Copy link

The inspection completed: 2 new issues

@lock lock bot locked as resolved and limited conversation to collaborators Aug 14, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants