mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #973 from nextcloud/stable10-959 

[stable10] Update mimetypes
This commit is contained in:
Marius Blüm 2016-08-19 13:13:50 +02:00 committed by GitHub
parent 1f473c11a1 2ab26f3667
commit c41bd47c0d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/js/mimetypelist.js
View File

@ -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",

5
resources/config/mimetypealiases.dist.json
View File

@ -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",

4
resources/config/mimetypemapping.dist.json
View File

@ -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"],