Skip to content

Commit a283200

Browse files
authored
Merge pull request #21105 from nextcloud/backport/21092/stable19
Update recommended apps
2 parents 33b06cf + abecd56 commit a283200

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

core/js/dist/recommendedapps.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/recommendedapps.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/components/setup/RecommendedApps.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ const recommended = {
8282
spreed: {
8383
description: t('core', 'Chatting, video calls, screensharing, online meetings and web conferencing – in your browser and with mobile apps.'),
8484
},
85-
onlyoffice: {
85+
richdocuments: {
8686
description: t('core', 'Collaboratively edit office documents.'),
8787
},
88-
documentserver_community: {
89-
description: t('core', 'Local document editing back-end used by the OnlyOffice app.'),
88+
richdocumentscode: {
89+
description: t('core', 'Local document editing back-end used by the Collabora Online app.'),
9090
},
9191
}
9292
const recommendedIds = Object.keys(recommended)

lib/private/App/AppStore/Bundles/HubBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public function getAppIdentifiers() {
3737
'contacts',
3838
'calendar',
3939
'mail',
40-
'documentserver_community',
41-
'onlyoffice',
40+
'richdocumentscode',
41+
'richdocuments',
4242
];
4343
}
4444
}

lib/private/Setup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ public static function updateHtaccess() {
543543
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
544544
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
545545
$content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
546+
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/richdocumentscode/proxy.php$";
546547
$content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]";
547548
$content .= "\n RewriteBase " . $rewriteBase;
548549
$content .= "\n <IfModule mod_env.c>";

0 commit comments

Comments
 (0)