aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-01-06 14:42:17 +0100
committerGitHub <noreply@github.com>2017-01-06 14:42:17 +0100
commitae934cbdab07cfa14baae1b71b031d2eb53c8d67 (patch)
treee6f709b20f7c2808ae84980ef50925654cb23645
parent5ed4020215ea5a0d4cf67f14778035b0fab9b34c (diff)
parent68a0f8e153223d20f8680cdbd965b140551da92b (diff)
downloadnextcloud-server-ae934cbdab07cfa14baae1b71b031d2eb53c8d67.tar.gz
nextcloud-server-ae934cbdab07cfa14baae1b71b031d2eb53c8d67.zip
Merge pull request #2966 from nextcloud/ldif-mime-support
recognize LDIF (and schema) file types
-rw-r--r--core/js/mimetypelist.js1
-rw-r--r--resources/config/mimetypemapping.dist.json2
2 files changed, 3 insertions, 0 deletions
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index e1b9dba14af..89558e21086 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -86,6 +86,7 @@ OC.MimeTypeList={
"text/x-c": "text/code",
"text/x-c++src": "text/code",
"text/x-h": "text/code",
+ "text/x-ldif": "text/code",
"text/x-java-source": "text/code",
"text/x-python": "text/code",
"text/x-shellscript": "text/code",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index a49a04e43f2..99638b6c02d 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -78,6 +78,7 @@
"key": ["application/x-iwork-keynote-sffkey"],
"keynote": ["application/x-iwork-keynote-sffkey"],
"kra": ["application/x-krita"],
+ "ldif": ["text/x-ldif"],
"lwp": ["application/vnd.lotus-wordpro"],
"m2t": ["video/mp2t"],
"m4a": ["audio/mp4"],
@@ -142,6 +143,7 @@
"rss": ["application/rss+xml"],
"rtf": ["text/rtf"],
"rw2": ["image/x-dcraw"],
+ "schema": ["text/plain"],
"sgf": ["application/sgf"],
"sh-lib": ["text/x-shellscript"],
"sh": ["text/x-shellscript"],