Merge branch 'release-3.2.1'

oat-sa · Feb 7, 2019 · ca3e090 · ca3e090
2 parents bcbeb13 + 63c525f
commit ca3e090
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
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' => '3.2.0',
+    'version' => '3.2.1',
 	'author' => 'Open Assessment Technologies SA',
 	'requires' => array(
 	   'taoBackOffice' => '>=3.0.0',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -137,6 +137,6 @@ public function update($initialVersion) {
             $this->setVersion('2.7.0');
         }
 
-        $this->skip('2.7.0', '3.2.0');
+        $this->skip('2.7.0', '3.2.1');
     }
 }
diff --git a/views/js/controller/admin/line.tpl b/views/js/controller/admin/line.tpl
@@ -23,7 +23,7 @@
         </label>
     </td>
     <td>
-        <button type="button" class="small delete_permission tooltip btn-warning" data-acl-user="{{user}}" data-acl-type="{{type}}" data-acl-label="{{label}}" >
+        <button type="button" class="small delete_permission btn-warning" data-acl-user="{{user}}" data-acl-type="{{type}}" data-acl-label="{{label}}" >
             <span class="icon-bin"></span>{{__ "Remove"}}
         </button>
     </td>

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