merge with userpreferences branch

learnweb · Jul 4, 2024 · 718499e · 718499e
2 parents 2166e9b + bf4f8e4
commit 718499e
Show file tree

Hide file tree

Showing 50 changed files with 2,490 additions and 306 deletions.
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.2']
-        moodle-branch: ['MOODLE_403_STABLE']
+        php: ['8.3']
+        moodle-branch: ['MOODLE_404_STABLE']
         database: ['pgsql']
 
     steps:
@@ -125,8 +125,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+<<<<<<< HEAD
         php: ['8.0', '8.1', '8.2', '8.3']
         moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE']
+=======
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
+        moodle-branch: [ 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE' ]
+>>>>>>> bf4f8e46d38657c979f74641afab4f65d030152c
         database: [ 'mariadb', 'pgsql' ]
         exclude:
           - php: '8.0'

diff --git a/amd/build/coursefilter.min.js b/amd/build/coursefilter.min.js
diff --git a/amd/build/coursefilter.min.js.map b/amd/build/coursefilter.min.js.map
diff --git a/amd/build/filtercontroller.min.js b/amd/build/filtercontroller.min.js
diff --git a/amd/build/filtercontroller.min.js.map b/amd/build/filtercontroller.min.js.map
diff --git a/amd/build/letterfilter.min.js b/amd/build/letterfilter.min.js
diff --git a/amd/build/letterfilter.min.js.map b/amd/build/letterfilter.min.js.map