Merge branch 'release-2.7.1'

oat-sa · Jul 27, 2018 · 0e45afe · 0e45afe
2 parents f810dfb + 5430670
commit 0e45afe
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "minimum-stability" : "dev",
     "require": {
-        "oat-sa/oatbox-extension-installer": "dev-master"
+        "oat-sa/oatbox-extension-installer": "~1.1||dev-master"
     },
     "autoload" : {
         "psr-4" : {

diff --git a/manifest.php b/manifest.php
@@ -28,7 +28,7 @@
 	'label' => 'extension-tao-dac-simple',
 	'description' => 'extension that allows admin to give access to some resources to other people',
     'license' => 'GPL-2.0',
-    'version' => '2.7.0',
+    'version' => '2.7.1',
 	'author' => 'Open Assessment Technologies SA',
 	'requires' => array(
 	   'taoBackOffice' => '>=1.4.0',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -136,5 +136,7 @@ public function update($initialVersion) {
             OntologyUpdater::syncModels();
             $this->setVersion('2.7.0');
         }
+
+        $this->skip('2.7.0', '2.7.1');
     }
 }
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