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

Merge pull request #21105 from nextcloud/backport/21092/stable19 

Update recommended apps
This commit is contained in:
Roeland Jago Douma 2020-05-26 10:01:23 +02:00 committed by GitHub
parent 33b06cfa0c abecd5696b
commit a283200dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/js/dist/recommendedapps.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/recommendedapps.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
core/src/components/setup/RecommendedApps.vue
View File

@ -82,11 +82,11 @@ const recommended = {
spreed: { spreed: {
description: t('core', 'Chatting, video calls, screensharing, online meetings and web conferencing – in your browser and with mobile apps.'), 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.'), description: t('core', 'Collaboratively edit office documents.'),
}, },
documentserver_community: { richdocumentscode: {
description: t('core', 'Local document editing back-end used by the OnlyOffice app.'), description: t('core', 'Local document editing back-end used by the Collabora Online app.'),
}, },
} }
const recommendedIds = Object.keys(recommended) const recommendedIds = Object.keys(recommended)

4
lib/private/App/AppStore/Bundles/HubBundle.php
View File

@ -37,8 +37,8 @@ class HubBundle extends Bundle {
'contacts', 'contacts',
'calendar', 'calendar',
'mail', 'mail',
'documentserver_community', 'richdocumentscode',
'onlyoffice', 'richdocuments',
]; ];
} }
} }

1
lib/private/Setup.php
View File

@ -543,6 +543,7 @@ class Setup {
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocm-provider/"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
$content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*"; $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 RewriteRule . index.php [PT,E=PATH_INFO:$1]";
$content .= "\n RewriteBase " . $rewriteBase; $content .= "\n RewriteBase " . $rewriteBase;
$content .= "\n <IfModule mod_env.c>"; $content .= "\n <IfModule mod_env.c>";