Skip to content

Update recommended apps #21092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
May 25, 2020
Merged

Update recommended apps #21092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde5b95
Update hub bundle and add proxy rule to htaccess
juliusknorr May 25, 2020
3f9856b
Bump bundles
juliusknorr May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/js/dist/recommendedapps.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/recommendedapps.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions core/src/components/setup/RecommendedApps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions lib/private/App/AppStore/Bundles/HubBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public function getAppIdentifiers() {
'contacts',
'calendar',
'mail',
'documentserver_community',
'onlyoffice',
'richdocumentscode',
'richdocuments',
];
}
}
1 change: 1 addition & 0 deletions lib/private/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ public static function updateHtaccess() {
$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$";
Copy link
Member Author

@juliusknorr juliusknorr May 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really not the ideal way to handle, but the only solution @rullzer and I came up with that works.

Copy link
Member

@MorrisJobke MorrisJobke May 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This then should also be documented in the nginx code and somehow it would be nice to autodetect this in the setup check to warn people about it. Because otherwise it's really hard to find, because nobody checks the nginx config after an upgrade and compares it against the current one in the documentation.

Copy link
Member Author

@juliusknorr juliusknorr May 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nginx config documentation update is on the todo list, same for a check for this on nginx in the richdocuments app that Collabora is currently working on. I would rather keep it there since it is more an app specific webserver config.

$content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]";
$content .= "\n RewriteBase " . $rewriteBase;
$content .= "\n <IfModule mod_env.c>";
Expand Down