Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update MIME Types

  • Loading branch information...
commit 18396f55519c359d79018e26879e164833f54e56 1 parent a2f0d44
@distler distler authored
View
12 app/controllers/application_controller.rb
@@ -62,6 +62,7 @@ def connect_to_model
'.aif' => 'audio/x-aiff',
'.aiff'=> 'audio/x-aiff',
'.avi' => 'video/x-msvideo',
+ '.cdf' => 'application/vnd.wolfram.cdf.text',
'.exe' => 'application/octet-stream',
'.gif' => 'image/gif',
'.jpg' => 'image/jpeg',
@@ -70,6 +71,7 @@ def connect_to_model
'.oga' => 'audio/ogg',
'.ogg' => 'audio/ogg',
'.ogv' => 'video/ogg',
+ '.m3u8'=> 'application/vnd.apple.mpegurl',
'.mov' => 'video/quicktime',
'.mp3' => 'audio/mpeg',
'.mp4' => 'video/mp4',
@@ -77,23 +79,27 @@ def connect_to_model
'.txt' => 'text/plain',
'.tex' => 'text/plain',
'.wav' => 'audio/x-wav',
+ '.webm'=> 'video/webm',
'.zip' => 'application/zip'
} unless defined? FILE_TYPES
DISPOSITION = {
'application/octet-stream' => 'attachment',
'application/pdf' => 'inline',
+ 'application/vnd.wolfram.cdf.text' => 'inline',
+ 'application/vnd.apple.mpegurl' => 'inline',
'image/gif' => 'inline',
'image/jpeg' => 'inline',
'image/png' => 'inline',
'audio/mpeg' => 'inline',
'audio/x-wav' => 'inline',
'audio/x-aiff' => 'inline',
- 'audio/speex' => 'inline',
+ 'audio/speex' => 'inline',
'audio/ogg' => 'inline',
'video/ogg' => 'inline',
'video/mp4' => 'inline',
'video/quicktime' => 'inline',
+ 'video/webm' => 'inline',
'video/x-msvideo' => 'inline',
'text/plain' => 'inline',
'application/zip' => 'attachment'
@@ -277,9 +283,9 @@ module Instiki
module VERSION #:nodoc:
MAJOR = 0
MINOR = 19
- TINY = 3
+ TINY = 5
SUFFIX = '(MML+)'
- PRERELEASE = false
+ PRERELEASE = '.5pre'
if PRERELEASE
STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX
else
View
6 config/mime_types.yml
@@ -1,15 +1,21 @@
---
.avi: video/avi
+.cdf: application/vnd.wolfram.cdf.text
.gz: application/x-gzip
.js: application/x-javascript
.nb: application/mathematica
.oga: audio/ogg
.ogg: audio/ogg
.ogv: video/ogg
+.m3u8: application/vnd.apple.mpegurl
+.mp3: audio/mp3
+.mp4: video/mp4
+.mpd: video/vnd.mpeg.dash.mpd
.pdf: application/pdf
.svg: application/svg+xml
.tar: application/x-tar
.tex: application/x-tex
+.webm: video/webm
.xhtml: application/xhtml+xml
.xml: application/xml
.xslt: application/xslt+xml
Please sign in to comment.
Something went wrong with that request. Please try again.