Merge branch 'release-0.3.1'

oat-sa · Oct 13, 2017 · 7043959 · 7043959
2 parents 1900968 + b906841
commit 7043959
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 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' => '0.3.0',
+    'version' => '0.3.1',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => [
         'tao' => '*'

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', '0.3.0');
+        $this->skip('0.1.0', '0.3.1');
     }
 }
diff --git a/views/css/foo.css b/views/css/foo.css
diff --git a/views/css/foo.css.map b/views/css/foo.css.map
diff --git a/views/js/controller/Foo/index.js b/views/js/controller/Foo/index.js
@@ -4,7 +4,7 @@ define([], function(){
     return {
         start : function start(){
             //foo starts
-            console.log('foo');
+            window.console.log('foo', arguments);
         }
     };
 });
diff --git a/views/js/controllers.min.js b/views/js/controllers.min.js
diff --git a/views/js/controllers.min.js.map b/views/js/controllers.min.js.map
diff --git a/views/scss/foo.scss b/views/scss/foo.scss
@@ -5,6 +5,7 @@ div {
     border: solid 1px pink;
 }
 a {
- color: pink;
- text-decoration: underline;
+    color: pink;
+    text-decoration: underline;
+    background-color : white;
 }