Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/communication/fix-push-notificatio…
Browse files Browse the repository at this point in the history 
…ns-for-user-mentions

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsService.java
  • Loading branch information
@FelberMartin
FelberMartin committed Feb 27, 2025
2 parents 5c28c8a + fede0c3 commit f5d5bf0
Show file tree
Hide file tree
Showing 141 changed files with 1,620 additions and 557 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/staging-deployment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ on:
type: choice
options:
- artemis-staging-localci.artemis.cit.tum.de
triggered_by:
description: "Username that triggered deployment (not required, shown if triggered via GitHub UI, logged if triggered via GitHub app)"
required: false
type: string

concurrency: ${{ github.event.inputs.environment_name }}

Expand All @@ -32,6 +36,7 @@ jobs:
echo "Branch: ${{ github.event.inputs.branch_name }}"
echo "Commit SHA: ${{ github.event.inputs.commit_sha }}"
echo "Environment: ${{ github.event.inputs.environment_name }}"
echo "Triggered by: ${{ github.event.inputs.triggered_by }}"
- name: Fetch workflow runs by branch and commit
id: get_workflow_run
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/testserver-deployment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
description: "Which branch to deploy"
required: true
type: string
commit_sha:
description: 'Commit SHA to deploy'
required: false
environment_name:
description: "Which environment to deploy (e.g. artemis-test7.artemis.cit.tum.de, etc.)."
required: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
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.10.3.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-8.0.0.war
```

## Architecture
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
}

group = "de.tum.cit.aet.artemis"
version = "7.10.3"
version = "8.0.0"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down Expand Up @@ -292,7 +292,8 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-aop:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-data-jpa:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.4.2"
implementation "org.springframework.data:spring-data-jpa:3.4.2"
implementation "org.springframework.boot:spring-boot-starter-security:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-web:${spring_boot_version}"
implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}"
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/setup.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ following dependencies/tools on your machine:
2. `MySQL Database Server 9 <https://dev.mysql.com/downloads/mysql>`__, or `PostgreSQL 17 <https://www.postgresql.org/>`_:
Artemis uses Hibernate to store entities in an SQL database and Liquibase to
automatically apply schema transformations when updating Artemis.
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=22.10.0 < 23) to compile
3. `node <https://nodejs.org/en/download>`__: We use node LTS (>=22.14.0 < 23) to compile
and run the client Angular application. Depending on your system, you
can install Node either from source or as a pre-packaged bundle.
4. `Npm <https://nodejs.org/en/download>`__: We use Npm (>=10.8.0) to
4. `npm <https://nodejs.org/en/download>`__: We use npm (>=11.1.0) to
manage client side dependencies. Npm is typically bundled with Node.js,
but can also be installed separately.
5. ( `Graphviz <https://www.graphviz.org/download/>`__: We use Graphviz to generate graphs within exercise task
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/setup/client.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ with your TUM Online account.
.. HINT::
In case you encounter any problems regarding JavaScript heap memory leaks when executing ``npm run start`` or
any other scripts from ``package.json``, you can adjust a
`memory limit parameter <https://nodejs.org/docs/latest-v16.x/api/cli.html#--max-old-space-sizesize-in-megabytes>`__
`memory limit parameter <https://nodejs.org/docs/latest-v22.x/api/cli.html#--max-old-space-sizesize-in-megabytes>`__
(``node-options=--max-old-space-size=6144``) which is set by default in the project-wide `.npmrc` file.

If you still face the issue, you can try to set a lower/higher value than 6144 MB.
Expand Down
31 changes: 17 additions & 14 deletions docs/user/communication.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Reply in Thread | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| See who reacted to a post | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Copy Text | | |NOT PLANNED| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Pin Messages | | Groups: group creators | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
Expand All @@ -181,13 +183,13 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Edit Message | Authors only | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Save Message for later | | |AVAILABLE| | |UNAVAILABLE| | |PLANNED| |
| Save Message for later | | |AVAILABLE| | |PLANNED| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Forward Messages | | |WIP| | |UNAVAILABLE| | |PLANNED| |
| Forward Messages | | |AVAILABLE| | |PLANNED| | |WIP| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Resolve Messages | At least tutor and authors | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Post action bar (thread view) | ||NOT PLANNED| | |AVAILABLE| | |WIP| |
| Post action bar (thread view) | ||NOT PLANNED| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
Expand All @@ -197,11 +199,11 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Reference channels, lectures and exercises | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Tag FAQ | | |AVAILABLE| | |WIP| | |PLANNED| |
| Tag FAQ | | |AVAILABLE| | |AVAILABLE| | |PLANNED| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Basic formatting (underline, bold, italic) | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Strikethrough formatting | | |AVAILABLE| | |UNAVAILABLE| | |PLANNED| |
| Strikethrough formatting | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Preview | | |AVAILABLE| | |UNAVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
Expand All @@ -215,11 +217,11 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| **Messages** |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Profile pictures | | |AVAILABLE| | |AVAILABLE| | |WIP| |
| Profile pictures | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Show if message was edited, resolved or pinned | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| | Render links to exercises, lectures, other chats, | | |AVAILABLE| | |AVAILABLE| | |WIP| |
| | Render links to exercises, lectures, other chats, | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
| | lecture-units, slides, lecture-attachment with | | | | |
| | correct icon | | | | |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
Expand All @@ -231,17 +233,17 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Render links to uploaded files | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Filter messages (unresolved, own, reacted) | | |AVAILABLE| | |AVAILABLE| | |UNAVAILABLE| |
| Filter messages (unresolved, own, reacted) | | |AVAILABLE| | |AVAILABLE| | |PLANNED| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Sort messages (ascending, descending) | | |AVAILABLE| | |NOT PLANNED| | |UNAVAILABLE| |
| Sort messages (ascending, descending) | | |AVAILABLE| | |NOT PLANNED| | |NOT PLANNED| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Search for messages in chat | | |UNAVAILABLE| | |UNAVAILABLE| | |AVAILABLE| |
| Search for messages in chat | | |AVAILABLE| | |UNAVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Search for messages across all chats | | |AVAILABLE| | |UNAVAILABLE| | |UNAVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Open Profile info by clicking profile picture | | |PLANNED| | |AVAILABLE| | |WIP| |
| Open Profile info by clicking profile picture | | |PLANNED| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Start a conversation from Profile | | |WIP| | |AVAILABLE| | |PLANNED| |
| Start a conversation from Profile | | |WIP| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
Expand All @@ -252,9 +254,9 @@ Available features on each platform
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Open sent images full-screen | | |AVAILABLE| | |AVAILABLE| | |PLANNED| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| Download sent images | | |AVAILABLE| | |PLANNED| | |UNAVAILABLE| |
| Download sent images | | |AVAILABLE| | |AVAILABLE| | |UNAVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| View and download attachments | | |AVAILABLE| | |PLANNED| | |PLANNED| |
| View and download attachments | | |AVAILABLE| | |AVAILABLE| | |AVAILABLE| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
| |
+------------------------------------------------------+--------------------------------------+--------------------+---------------------+---------------------+
Expand Down Expand Up @@ -333,6 +335,7 @@ Available features on each platform
- Leave chat option is available on the web app for groups only, on iOS for groups and non course-wide channels, and on Android for channels, groups, and DMs.
- Creating a group chat on iOS and Android can be achieved via the 'Create Chat' option. It becomes a group when more than one user is added.
- Downloading sent images in the chat is only available through the browser option on the web app.
- Seeing who reacted to a post is available when hovering over a reaction on the web app.

Features for Users
------------------
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ rootProject.name=Artemis
profile=dev

# Build properties
node_version=22.12.0
npm_version=10.9.0
node_version=22.14.0
npm_version=11.1.0

# Dependency versions
jhipster_dependencies_version=8.9.0
Expand Down
7 changes: 4 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "artemis",
"version": "7.10.3",
"version": "8.0.0",
"description": "Interactive Learning with Individual Feedback",
"private": true,
"license": "MIT",
Expand Down Expand Up @@ -193,7 +193,8 @@
"weak-napi": "2.0.2"
},
"engines": {
"node": ">=22.10.0"
"node": ">=22.14.0",
"npm": ">=11.1.0"
},
"scripts": {
"build": "npm run webapp:prod --",
Expand Down
Loading

0 comments on commit f5d5bf0

Please sign in to comment.