Merge branch 'dev' into geogebra_stackjs

maths · Oct 17, 2023 · bfea9c6 · bfea9c6
2 parents ef64b73 + 7743a03
commit bfea9c6
Show file tree

Hide file tree

Showing 88 changed files with 1,665 additions and 289 deletions.
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -164,7 +164,7 @@ jobs:
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ matrix.moodle-branch == 'MOODLE_311_STABLE' }}
+        if: ${{ matrix.moodle-branch == 'MOODLE_401_STABLE' }}
         run: moodle-plugin-ci grunt
 
       - name: PHPUnit tests

diff --git a/adminui/index.php b/adminui/index.php
@@ -43,6 +43,8 @@
             array('link' => (string) new moodle_url('/question/type/stack/adminui/studentinputs.php'))),
     get_string('bulktestindexintro_desc', 'qtype_stack',
             array('link' => (string) new moodle_url('/question/type/stack/adminui/bulktestindex.php'))),
+    get_string('dependenciesintro_desc', 'qtype_stack',
+        array('link' => (string) new moodle_url('/question/type/stack/adminui/dependencies.php'))),
     get_string('stackInstall_replace_dollars_desc', 'qtype_stack',
             array('link' => (string) new moodle_url('/question/type/stack/adminui/replacedollarsindex.php'))),
 );

diff --git a/amd/build/input.min.js b/amd/build/input.min.js
diff --git a/amd/build/input.min.js.map b/amd/build/input.min.js.map