Merge remote-tracking branch 'origin/maven/fixes/8.0' into maven/rele…

…ase/8.0
edu-sharing · Nov 10, 2023 · f8dd17f · f8dd17f
2 parents b0dc500 + b46de97
commit f8dd17f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ deploy_release:
   image: php:latest
   stage: deploy
   artifacts:
-    name: 'educonnector_release$(date +"%Y-%m-%d")${CI_COMMIT_SHORT_SHA}'
+    name: "educonnector_release-$CI_PIPELINE_CREATED_AT-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
     paths:
       - ./service/src/main/php
   before_script:

diff --git a/service/src/main/php/src/tools/h5p/js/customEdu.css b/service/src/main/php/src/tools/h5p/js/customEdu.css
@@ -0,0 +1,3 @@
+.field-name-extraTitle {
+    display: none;
+}
diff --git a/service/src/main/php/src/tools/h5p/js/h5peditor-init.js b/service/src/main/php/src/tools/h5p/js/h5peditor-init.js
@@ -14,6 +14,7 @@
 
         // Required styles and scripts for the editor
         H5PEditor.assets = H5PIntegration.editor.assets;
+        H5PEditor.assets.css.push('/src/tools/h5p/js/customEdu.css')
 
         // Required for assets
         H5PEditor.baseUrl = '';
@@ -103,7 +104,7 @@
             }
         });
 
-        clearInterval(window.i);;
+        clearInterval(window.i);
     };
 
     H5PEditor.getAjaxUrl = function (action, parameters) {

diff --git a/service/src/main/php/src/tools/tinymce/js/tool.js b/service/src/main/php/src/tools/tinymce/js/tool.js
@@ -79,7 +79,7 @@ $(document).ready(function() {
             tinyMCE.activeEditor.save(); // to reset isDirty
             save();
         }
-    }, 300000);
+    }, 30000);
 
     if(access < 1) {
         destroy([language.functiondeactivatedheading, language.functiondeactivatedtext, language.closeeditor]);