Merge branch 'develop' into feature/text-exercises/replace-modal-with…

…-inline-feedback
ls1intum · Oct 28, 2024 · e6fae3a · e6fae3a
2 parents ba65dc0 + c442c93
commit e6fae3a
Show file tree

Hide file tree

Showing 136 changed files with 1,806 additions and 736 deletions.
diff --git a/README.md b/README.md
@@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.4.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.5.war
 ```
 
 ## Architecture

diff --git a/angular.json b/angular.json
@@ -20,39 +20,40 @@
         "build": {
           "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "allowedCommonJsDependencies": [
-              "clone-deep",
-              "crypto-js",
-              "crypto",
-              "dagre",
-              "dayjs/locale/de",
-              "dompurify",
-              "export-to-csv",
-              "hoist-non-react-statics",
-              "interactjs",
-              "is-mobile",
-              "js-video-url-parser",
-              "jszip",
-              "localforage",
-              "mobile-drag-drop",
-              "papaparse",
-              "pepjs",
-              "prop-types",
-              "react",
-              "react-dom",
-              "react-dom/client",
-              "react-is",
-              "rfdc",
-              "shallowequal",
-              "showdown-highlight",
-              "showdown-katex",
-              "showdown",
-              "smoothscroll-polyfill",
-              "sockjs-client",
-              "use-sync-external-store/shim",
-              "use-sync-external-store/shim/with-selector",
-              "webcola",
-              "webstomp-client"
+              "allowedCommonJsDependencies": [
+                  "@vscode/markdown-it-katex",
+                  "clone-deep",
+                  "crypto-js",
+                  "crypto",
+                  "dagre",
+                  "dayjs/locale/de",
+                  "dompurify",
+                  "emoji-js",
+                  "export-to-csv",
+                  "hoist-non-react-statics",
+                  "interactjs",
+                  "is-mobile",
+                  "js-video-url-parser",
+                  "jszip",
+                  "localforage",
+                  "markdown-it-highlightjs",
+                  "mobile-drag-drop",
+                  "papaparse",
+                  "pepjs",
+                  "prop-types",
+                  "react",
+                  "react-dom",
+                  "react-dom/client",
+                  "react-is",
+                  "rfdc",
+                  "shallowequal",
+                  "markdown-it-class",
+                  "smoothscroll-polyfill",
+                  "sockjs-client",
+                  "use-sync-external-store/shim",
+                  "use-sync-external-store/shim/with-selector",
+                  "webcola",
+                  "webstomp-client"
             ],
             "outputPath": {
                 "base": "build/resources/main/static/",

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.6.4"
+version = "7.6.5"
 description = "Interactive Learning with Individual Feedback"
 
 java {

diff --git a/docs/user/markdown-support.rst b/docs/user/markdown-support.rst
@@ -9,7 +9,7 @@ Markdown Support
 
 `Markdown <https://daringfireball.net/projects/markdown/>`__ is an easy-to-read, easy-to-write syntax for formatting plain text.
 
-A markdown playground can be found  `here <http://demo.showdownjs.com/>`__.
+A markdown playground can be found  `here <https://markdown-it.github.io/>`__.
 
 Artemis extends the basic `Markdown <https://daringfireball.net/projects/markdown/>`__ syntax to support Artemis-specific features. This Artemis flavored Markdown is used to format text content across the platform using an integrated markdown editor.
 
@@ -52,9 +52,9 @@ Markdown is also supported in the context of :ref:`communicating<communication>`
 Supported Syntax
 ^^^^^^^^^^^^^^^^
 
-The integrated markdown editor uses `Showdown <https://github.com/showdownjs/showdown>`__. A quick description of the supported syntax can be found `here <https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax>`__.
+The integrated markdown editor uses `MarkdownIt <https://github.com/markdown-it/markdown-it>`__. A quick description of the supported syntax can be found `here <https://www.markdownguide.org/basic-syntax/>`__.
 
-The following Showdown extensions are activated:
+The following Plugins are activated:
 
-- `Showdown Katex <https://obedm503.github.io/showdown-katex>`__ to render LaTeX math and AsciiMath using KaTeX.
-- `Showdown Highlight <https://github.com/Bloggify/showdown-highlight>`__ for syntax highlighting in code blocks.
+- `MarkdownIt Katex <https://github.com/microsoft/vscode-markdown-it-katex>`__ to render LaTeX math and AsciiMath using KaTeX.
+- `MarkdownIt HighlightJS <https://github.com/valeriangalliat/markdown-it-highlightjs>`__ for syntax highlighting in code blocks.
diff --git a/jest.config.js b/jest.config.js
@@ -102,10 +102,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.53,
+            statements: 87.52,
             branches: 73.62,
-            functions: 82.13,
-            lines: 87.58,
+            functions: 82.12,
+            lines: 87.57,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],