From a774efb0f9f58671e431a4f53393734eb81991d0 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 19 Aug 2016 09:55:38 +0200
Subject: [PATCH] Update mimetypes
---
core/js/mimetypelist.js | 3 +++
resources/config/mimetypealiases.dist.json | 5 +++--
resources/config/mimetypemapping.dist.json | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 89c6e8c4d4e..08b892ce8bb 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -56,13 +56,16 @@ OC.MimeTypeList={
"application/vnd.visio": "x-office/document",
"application/vnd.wordperfect": "x-office/document",
"application/x-7z-compressed": "package/x-generic",
+ "application/x-bzip2": "package/x-generic",
"application/x-cbr": "text",
"application/x-compressed": "package/x-generic",
"application/x-dcraw": "image",
"application/x-deb": "package/x-generic",
+ "application/x-fictionbook+xml": "text",
"application/x-font": "image",
"application/x-gimp": "image",
"application/x-gzip": "package/x-generic",
+ "application/x-mobipocket-ebook": "text",
"application/x-perl": "text/code",
"application/x-photoshop": "image",
"application/x-php": "text/code",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 8445198e32c..8b47867447f 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -1,7 +1,7 @@
{
"_comment" : "Array of mimetype aliases.",
- "_comment2": "Any changes you make here will be overwritten on an update of ownCloud.",
- "_comment3": "Put any custom mappings in a new file mimetypealiases.json in the config/ folder of ownCloud",
+ "_comment2": "Any changes you make here will be overwritten on an update of Nextcloud.",
+ "_comment3": "Put any custom mappings in a new file mimetypealiases.json in the config/ folder of Nextcloud",
"_comment4": "After any change to mimetypealiases.json run:",
"_comment5": "./occ maintenance:mimetype:update-js",
@@ -65,6 +65,7 @@
"application/x-font": "image",
"application/x-gimp": "image",
"application/x-gzip": "package/x-generic",
+ "application/x-mobipocket-ebook": "text",
"application/x-perl": "text/code",
"application/x-photoshop": "image",
"application/x-php": "text/code",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 00c4e8bf12f..a49a04e43f2 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -3,8 +3,8 @@
"_comment2": "The first index in the mime type array is the assumed correct mimetype",
"_comment3": "and the second (if present] is a secure alternative",
- "_comment4": "Any changes you make here will be overwritten on an update of ownCloud",
- "_comment5": "Put any custom mappings in a new file mimetypemapping.json in the config/ folder of ownCloud",
+ "_comment4": "Any changes you make here will be overwritten on an update of Nextcloud",
+ "_comment5": "Put any custom mappings in a new file mimetypemapping.json in the config/ folder of Nextcloud",
"3gp": ["video/3gpp"],
--
GitLab