Skip to content
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.

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

Move mime types registration to storageprovider #1284

Merged
merged 4 commits into from
Oct 29, 2020

Conversation

glpatcern
Copy link
Member

@glpatcern glpatcern commented Oct 28, 2020

Tested with @SamuAlfageme: the yet unreleased custom mimetypes registration (#1233) to support .zmd needs to be moved to the storageprovider, in order to support the case of (remote) storageproviders running separately from appproviders.

On top, PR #1234 has a bug in case the WOPI bridge is not configured. This patch fixes that as well.

@update-docs
Copy link

update-docs bot commented Oct 28, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@glpatcern glpatcern marked this pull request as draft October 28, 2020 10:50
@glpatcern glpatcern force-pushed the appprovider-fix-1234 branch 2 times, most recently from bc55e70 to 0008c2d Compare October 28, 2020 17:56
@glpatcern glpatcern changed the title Fixed case of unconfigured WOPI bridge Move mime types registration to storageprovider Oct 29, 2020
@glpatcern glpatcern requested review from ishank011 and removed request for labkode October 29, 2020 07:56
@glpatcern glpatcern marked this pull request as ready for review October 29, 2020 07:56
ishank011
ishank011 previously approved these changes Oct 29, 2020
@ishank011
Copy link
Contributor

@glpatcern can you rebase?

@glpatcern
Copy link
Member Author

glpatcern commented Oct 29, 2020

@glpatcern can you rebase?

Done! I guess it can be merged once the build finishes...
Edit: the build finished but tests fail, though unrelated to this PR. @ishank011 what's the deal then?

@ishank011 ishank011 merged commit 6ea69cb into cs3org:master Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants