Merge branch 'develop' into feature/programming-exercises/code-button…

…-configuration
ls1intum · Jan 23, 2025 · f114d21 · f114d21
2 parents ed9489d + 4bc01b6
commit f114d21
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 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.9.0.war
+./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.9.1.war
 ```
 
 ## Architecture

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

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "7.9.0",
+    "version": "7.9.1",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",

diff --git a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html
@@ -89,11 +89,11 @@ <h4 class="modal-title">
                             @if (message.sender === IrisSender.USER) {
                                 <div class="d-flex justify-content-end align-items-center">
                                     @if (content.type === IrisMessageContentType.TEXT) {
-                                        <pre>
-                                                <span
-                                                    [innerHTML]="(content | as: IrisTextMessageContent).textContent | htmlForMarkdown"
-                                                    class="bubble-right"></span>
-                                            </pre>
+                                        <span class="bubble-right">
+                                            @for (line of (content | as: IrisTextMessageContent).textContent.split('\n'); track line) {
+                                                <div [innerHTML]="line"></div>
+                                            }
+                                        </span>
                                     }
                                 </div>
                             }

diff --git a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.scss b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.scss
@@ -191,7 +191,7 @@
         }
 
         ::ng-deep pre code {
-            line-height: 0.8;
+            line-height: 1;
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,7 +191,7 @@ @@
             }
             ::ng-deep pre code {
-                line-height: 0.8;
+                line-height: 1;
             }
         }
     }
@@ Expand Down @@