Browse Source
Merge pull request #21092 from nextcloud/enh/noid/recommended-apps
Update recommended apps
pull/21108/head
Roeland Jago Douma
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
10 additions and
9 deletions
-
core/js/dist/recommendedapps.js
-
core/js/dist/recommendedapps.js.map
-
core/src/components/setup/RecommendedApps.vue
-
lib/private/App/AppStore/Bundles/HubBundle.php
-
lib/private/Setup.php
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -37,8 +37,8 @@ class HubBundle extends Bundle { |
|
|
|
'contacts', |
|
|
|
'calendar', |
|
|
|
'mail', |
|
|
|
'documentserver_community', |
|
|
|
'onlyoffice', |
|
|
|
'richdocumentscode', |
|
|
|
'richdocuments', |
|
|
|
]; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -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>"; |
|
|
|
|