aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-10-14 12:58:34 +0200
committerGitHub <noreply@github.com>2021-10-14 12:58:34 +0200
commitacbe4b46c39703f0d3c1e205d4609c7a2607b4b1 (patch)
tree02b3be4a00e255bc4e1ff426c19158c8e1362406 /core
parented533bd128807ae4e41efb590d59afe05c26668c (diff)
parent2f38781c965904ad10da1953be445fa690adc2cd (diff)
downloadnextcloud-server-acbe4b46c39703f0d3c1e205d4609c7a2607b4b1.tar.gz
nextcloud-server-acbe4b46c39703f0d3c1e205d4609c7a2607b4b1.zip
Merge pull request #29157 from nextcloud/enh/opendocument
Diffstat (limited to 'core')
-rw-r--r--core/img/filetypes/x-office-drawing.svg1
-rw-r--r--core/js/mimetypelist.js7
2 files changed, 8 insertions, 0 deletions
diff --git a/core/img/filetypes/x-office-drawing.svg b/core/img/filetypes/x-office-drawing.svg
new file mode 100644
index 00000000000..352347b6348
--- /dev/null
+++ b/core/img/filetypes/x-office-drawing.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M2.5 1c-.28 0-.5.22-.5.5v13c0 .28.22.5.5.5h11c.28 0 .5-.22.5-.5V4l-3-3H2.5zM4 6h2.8v1.2h2.4V6H12v3.2H9.2V8h-.8v3.2h.8V10H12v3.2H9.2V12H7.6V8h-.8v1.2H4V6z" style="fill:#ebc94a;fill-opacity:1"/></svg>
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index bd9b2bd69f1..a891aeec95c 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -55,7 +55,13 @@ OC.MimeTypeList={
"application/vnd.oasis.opendocument.text": "x-office/document",
"application/vnd.oasis.opendocument.text-master": "x-office/document",
"application/vnd.oasis.opendocument.text-template": "x-office/document",
+ "application/vnd.oasis.opendocument.graphics": "x-office/drawing",
+ "application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
"application/vnd.oasis.opendocument.text-web": "x-office/document",
+ "application/vnd.oasis.opendocument.text-flat-xml": "x-office/document",
+ "application/vnd.oasis.opendocument.spreadsheet-flat-xml": "x-office/spreadsheet",
+ "application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
+ "application/vnd.oasis.opendocument.presentation-flat-xml": "x-office/presentation",
"application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
"application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
"application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",
@@ -129,6 +135,7 @@ OC.MimeTypeList={
"text-vcard",
"video",
"x-office-document",
+ "x-office-drawing",
"x-office-presentation",
"x-office-spreadsheet"
],