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
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-05-25 21:47:20 +0300
committerGitHub <noreply@github.com>2020-05-25 21:47:20 +0300
commit4bada5c7324d4ebf58a8ab2c8954b8e35cc883b2 (patch)
tree1d07383939584df6ed5bbaef9ecd1344d6ae39c2 /lib
parenta6b0bed5857c9384ca5537a30c633ab832b083e1 (diff)
parent3f9856bc7c4fe967948bf0a83f5e45b8517b9f32 (diff)
Merge pull request #21092 from nextcloud/enh/noid/recommended-apps
Update recommended apps
Diffstat (limited to 'lib')
-rw-r--r--lib/private/App/AppStore/Bundles/HubBundle.php4
-rw-r--r--lib/private/Setup.php1
2 files changed, 3 insertions, 2 deletions
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>";