summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2017-06-15 13:23:32 +0200
committerGitHub <noreply@github.com>2017-06-15 13:23:32 +0200
commit8ccc2e27586d4c77dd68f8e5fcf696d39af012a2 (patch)
treefed1a6309b857bc196be7ebf55b6c1cd025b6788 /core/js
parentca3c69c8ae0fd7f0d13e87d7861c54e2950a2c09 (diff)
parent0f92a2c6fdce9130433d54f62725abfc6d692e9d (diff)
downloadnextcloud-server-8ccc2e27586d4c77dd68f8e5fcf696d39af012a2.tar.gz
nextcloud-server-8ccc2e27586d4c77dd68f8e5fcf696d39af012a2.zip
Merge pull request #5396 from nextcloud/gpx-mimetype
add gpx mimetype
Diffstat (limited to 'core/js')
-rw-r--r--core/js/mimetypelist.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 89558e21086..b0104b50bef 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -12,6 +12,7 @@ OC.MimeTypeList={
"application/epub+zip": "text",
"application/font-sfnt": "image",
"application/font-woff": "image",
+ "application/gpx+xml": "location",
"application/illustrator": "image",
"application/javascript": "text/code",
"application/json": "text/code",
@@ -25,6 +26,9 @@ OC.MimeTypeList={
"application/rss+xml": "application/xml",
"application/vnd.android.package-archive": "package/x-generic",
"application/vnd.lotus-wordpro": "x-office/document",
+ "application/vnd.garmin.tcx+xml": "location",
+ "application/vnd.google-earth.kml+xml": "location",
+ "application/vnd.google-earth.kmz": "location",
"application/vnd.ms-excel": "x-office/spreadsheet",
"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
@@ -86,8 +90,8 @@ 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-ldif": "text/code",
"text/x-python": "text/code",
"text/x-shellscript": "text/code",
"web": "text/code"
@@ -104,6 +108,7 @@ OC.MimeTypeList={
"folder-shared",
"folder-starred",
"image",
+ "location",
"package-x-generic",
"text",
"text-calendar",