Merge pull request #29164 from Davgraols/master

added support for eml mimetype
owncloud · Oct 10, 2017 · 14eb2b8 · 14eb2b8
2 parents 4ae42cf + bcb3170
commit 14eb2b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
@@ -75,6 +75,7 @@ OC.MimeTypeList={
     "application/zip": "package/x-generic",
     "database": "file",
     "httpd/unix-directory": "dir",
+    "message/rfc822": "text",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
     "text/html": "text/code",
@@ -108,7 +109,5 @@ OC.MimeTypeList={
     "x-office-presentation",
     "x-office-spreadsheet"
 ],
-	themes: {
-    "example": []
-}
+	themes: []
 };
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
@@ -66,6 +66,7 @@
 	"application/zip": "package/x-generic",
 	"database": "file",
 	"httpd/unix-directory": "dir",
+	"message/rfc822": "text",
 	"text/css": "text/code",
 	"text/csv": "x-office/spreadsheet",
 	"text/html": "text/code",
@@ -76,4 +77,4 @@
 	"text/x-python": "text/code",
 	"text/x-shellscript": "text/code",
 	"web": "text/code"
-}
+}
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
@@ -39,6 +39,7 @@
 	"dot": ["application/msword"],
 	"dotx": ["application/vnd.openxmlformats-officedocument.wordprocessingml.template"],
 	"dv": ["video/dv"],
+	"eml": ["message/rfc822"],
 	"eot": ["application/vnd.ms-fontobject"],
 	"epub": ["application/epub+zip"],
 	"eps": ["application/postscript"],