Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/src/components/setup/RecommendedApps.vue6
-rw-r--r--lib/private/App/AppStore/Bundles/HubBundle.php4
-rw-r--r--lib/private/Setup.php1
3 files changed, 6 insertions, 5 deletions
diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 550c3aaff70..46fac684370 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -82,11 +82,11 @@ const recommended = {
spreed: {
description: t('core', 'Chatting, video calls, screensharing, online meetings and web conferencing – in your browser and with mobile apps.'),
},
- onlyoffice: {
+ richdocuments: {
description: t('core', 'Collaboratively edit office documents.'),
},
- documentserver_community: {
- description: t('core', 'Local document editing back-end used by the OnlyOffice app.'),
+ richdocumentscode: {
+ description: t('core', 'Local document editing back-end used by the Collabora Online app.'),
},
}
const recommendedIds = Object.keys(recommended)
diff --git a/lib/private/App/AppStore/Bundles/HubBundle.php b/lib/private/App/AppStore/Bundles/HubBundle.php
index 18dd9093623..59b52389ef8 100644
--- a/lib/private/App/AppStore/Bundles/HubBundle.php
+++ b/lib/private/App/AppStore/Bundles/HubBundle.php
@@ -37,8 +37,8 @@ class HubBundle extends Bundle {
'contacts',
'calendar',
'mail',
- 'documentserver_community',
- 'onlyoffice',
+ 'richdocumentscode',
+ 'richdocuments',
];
}
}
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 3fc8415e29a..856ed1d7885 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -543,6 +543,7 @@ class Setup {
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
$content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
+ $content .= "\n RewriteCond %{REQUEST_FILENAME} !/richdocumentscode/proxy.php$";
$content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]";
$content .= "\n RewriteBase " . $rewriteBase;
$content .= "\n <IfModule mod_env.c>";