Merge branch 'release-1.4.0'

oat-sa · Jan 30, 2019 · c071f94 · c071f94
2 parents b1d92a9 + 036933d
commit c071f94
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/manifest.php b/manifest.php
@@ -26,7 +26,7 @@
     'label' => 'FooBar power extension',
     'description' => 'Dummy test extension',
     'license' => 'GPL-2.0',
-    'version' => '1.3.4',
+    'version' => '1.4.0',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => [
         'tao' => '>=21.0.1'

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -34,6 +34,6 @@ class Updater extends \common_ext_ExtensionUpdater
      */
     public function update($initialVersion)
     {
-        $this->skip('0.1.0', '1.3.4');
+        $this->skip('0.1.0', '1.4.0');
     }
 }
diff --git a/views/js/controller/Foo/foodex.js b/views/js/controller/Foo/foodex.js
@@ -11,6 +11,7 @@ define([], function(){
 
             window.console.log('Never use alerts, they block the event loop');
             window.console.log('that was really nasty :-O');
+            window.console.log('Are you sure, alert are pretty convenient');
 
             window.addEventListener('error', function(err){
                 window.console.error(err);

diff --git a/views/js/controller/routes.js b/views/js/controller/routes.js
@@ -27,7 +27,8 @@ define(function(){
             'actions' : {
                 'index' : 'controller/Foo/index',
                 'foodex' : 'controller/Foo/foodex',
-                'moodex' : 'controller/Foo/foodex'
+                'moodex' : 'controller/Foo/foodex',
+                'yoodex' : 'controller/Foo/foodex'
             }
         }
     };

diff --git a/views/js/loader/taoFooBar.min.js b/views/js/loader/taoFooBar.min.js
diff --git a/views/js/loader/taoFooBar.min.js.map b/views/js/loader/taoFooBar.min.js.map