Skip to content

Commit

Permalink
Merge branch 'develop' into chore/exam-mode/add-save-button
Browse files Browse the repository at this point in the history
Pull latest changes
  • Loading branch information
edkaya committed Nov 1, 2024
2 parents f588a00 + 998d6c0 commit 396f4b8
Show file tree
Hide file tree
Showing 394 changed files with 6,573 additions and 3,202 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ The following members of the project management team are responsible for specifi
| Exercises | Stephan Krusche ([@krusche](https://github.com/krusche)) |
| Programming exercises | Stephan Krusche ([@krusche](https://github.com/krusche)) |
| Build agents | Robert Jandow ([@robertjndw](https://github.com/robertjndw)) |
| Quiz exercises | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich)) |
| Quiz exercises | Timor Morrien ([@Hialus](https://github.com/Hialus)) |
| Modeling exercises | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich)) |
| Text exercises | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch)) |
| Text exercises | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich)) |
| File upload exercises | Elisabeth Friesinger ([@easy-lisi](https://github.com/easy-lisi)) |
| Exam mode | Stephan Krusche ([@krusche](https://github.com/krusche)) |
| Assessment | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch)) |
Expand Down Expand Up @@ -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
Expand Down
67 changes: 34 additions & 33 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions docs/admin/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This section describes some additional steps that are of interest for production
For information on how to set up extension services to activate additional functionality in your Artemis instance, see
:ref:`their respective documentation <extensions_setup>`.

We recommend using the `Artemis Ansible Collection <https://github.com/ls1intum/artemis-ansible-collection>`_ for
setting up Artemis in production. The collection provides a set of Ansible roles that automate the setup of Artemis,
including the required external system with sane configuration defaults.

.. toctree::
:includehidden:
:maxdepth: 2
Expand Down
52 changes: 24 additions & 28 deletions docs/admin/setup/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -126,45 +126,41 @@ For Artemis to find the key set `artemis.version-control.ssh-host-key-path` to t
Adapting Nginx to Enable SSH Routing
""""""""""""""""""""""""""""""""""""

To enable SSH routing through Nginx, you can set up an SSH proxy. However, Nginx by itself does
not support SSH, but you can use Nginx to reverse proxy an SSH service (e.g., using sslh to multiplex SSH and HTTPS).
To enable SSH routing through Nginx, you can set up an SSH proxy.

Configure sslh to listen on port 443 (to handle both HTTPS and SSH), by editing the sslh configuration
file (e.g., /etc/default/sslh):

.. code-block:: text
RUN=yes
DAEMON=/usr/sbin/sslh
DAEMON_OPTS="--user sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:8443"
Configure Nginx to proxy HTTPS traffic, by adapting the configuration file to listen on port 8443 for HTTPS:
Configure Nginx to proxy HTTPS traffic on port 443 and SSH traffic on port 7921.

.. code-block:: nginx
server {
listen 8443 ssl;
server_name yourdomain.com;
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;
http {
server {
listen 443 ssl;
server_name yourdomain.com;
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;
location / {
proxy_pass http://127.0.0.1:8080;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
}
location / {
proxy_pass http://127.0.0.1:8080;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
stream {
server {
listen 7921;
proxy_pass 127.0.0.1:7921;
}
}
Restart sslh and Nginx:
Restart Nginx:

.. code-block:: bash
sudo systemctl restart sslh
sudo systemctl restart nginx
By following these steps, you ensure that your key pairs are properly generated and distributed across all
Expand Down
10 changes: 5 additions & 5 deletions docs/user/markdown-support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.
6 changes: 3 additions & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
Loading

0 comments on commit 396f4b8

Please sign in to comment.