Merge branch 'dev' into feature/vouchers-user-promotion

MaMpf-HD · Aug 14, 2024 · b533d81 · b533d81
2 parents 5efa753 + d0f8f44
commit b533d81
Show file tree

Hide file tree

Showing 71 changed files with 3,173 additions and 1,846 deletions.
diff --git a/.config/.cypress.js b/.config/.cypress.js
@@ -1,6 +1,7 @@
 module.exports = {
   e2e: {
-    // Add configuration here
     // Base URL is set via Docker environment variable
+    viewportHeight: 1000,
+    viewportWidth: 1400,
   },
 };
diff --git a/.config/eslint.mjs b/.config/eslint.mjs
@@ -99,6 +99,8 @@ const customGlobals = {
 
   // KaTeX
   renderMathInElement: "readable",
+
+  openAnnotationIfSpecifiedInUrl: "readable",
 };
 
 export default [

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -104,7 +104,9 @@
     //////////////////////////////////////
     "cSpell.words": [
         "commontator",
+        "factorybot",
         "helpdesk",
+        "katex",
         "turbolinks"
     ]
 }