Merge pull request #63 from oat-sa/develop

Develop
oat-sa · May 11, 2016 · f4718be · f4718be
2 parents 09ea1dc + 5d17136
commit f4718be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/actions/MediaManager.php b/actions/MediaManager.php
@@ -110,14 +110,14 @@ public function getFile()
             $fileManagement = $this->getServiceManager()->get(FileManagement::SERVICE_ID);
 
             if($fileInfo['mime'] === 'application/qti+xml'){
-                \tao_helpers_Http::returnStream($fileManagement->getFileStream($link), $fileManagement->getFileSize($link));
+                \tao_helpers_Http::returnStream($fileManagement->getFileStream($link));
                 return;
             }
             if($this->hasRequestParameter('xml')){
                 $this->returnJson(htmlentities((string)$fileManagement->getFileStream($link)));
             }
             else{
-                \tao_helpers_Http::returnStream($fileManagement->getFileStream($link), $fileManagement->getFileSize($link), $fileInfo['mime']);
+                \tao_helpers_Http::returnStream($fileManagement->getFileStream($link), $fileInfo['mime']);
             }
         } else {
             throw new \common_exception_Error('invalid media identifier');

diff --git a/manifest.php b/manifest.php
@@ -27,10 +27,10 @@
     'label' => 'extension-tao-mediamanager',
     'description' => 'TAO media manager extension',
     'license' => 'GPL-2.0',
-    'version' => '0.4.3',
+    'version' => '0.5.0',
     'author' => 'Open Assessment Technologies SA',
     'requires' => array(
-        'tao' => '>=2.16.0',
+        'tao' => '>=3.0.0',
         'taoItems' => '>=2.9'
     ),
     'models' => array(

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -207,8 +207,6 @@ public function update($initialVersion)
             $currentVersion = '0.3.0';
         }
 
-        $this->skip('0.3.0','0.4.3');
-
-        return null;
+        $this->skip('0.3.0','0.5.0');
     }
 }
diff --git a/views/build/grunt/bundle.js b/views/build/grunt/bundle.js
@@ -26,7 +26,7 @@ module.exports = function(grunt) {
             modules : [{
                 name: 'taoMediaManager/controller/routes',
                 include : ext.getExtensionsControllers(['taoMediaManager']),
-                exclude : ['mathJax', 'mediaElement'].concat(libs)
+                exclude : ['mathJax'].concat(libs)
             }]
         }
     };