Skip to content

Commit 2fc0c5d

Browse files
committed
Merge branch 'develop'
2 parents 08db364 + 0d62e88 commit 2fc0c5d

File tree

10 files changed

+1663
-301
lines changed

10 files changed

+1663
-301
lines changed

.github/workflows/dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and Deploy to Dev
33
on:
44
pull_request:
55
push:
6-
branches: [main]
6+
branches: [develop, main]
77

88
jobs:
99
run-tests:

.whitesource

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"scanSettings": {
33
"enableScan": true,
4-
"baseBranches": ["main"],
4+
"baseBranches": ["develop"],
55
"scanDependabotPR": false
66
},
77
"checkRunSettings": {

client/package-lock.json

+270-267
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "thesis-management",
3-
"version": "3.0.6",
3+
"version": "3.0.7",
44
"description": "Management of the Thesis Lifecycle in Universities",
55
"private": true,
66
"license": "MIT",
@@ -30,20 +30,20 @@
3030
"update": "ncu -i --format group"
3131
},
3232
"dependencies": {
33-
"@mantine/core": "7.16.1",
34-
"@mantine/dates": "7.16.1",
35-
"@mantine/dropzone": "7.16.1",
36-
"@mantine/form": "7.16.1",
37-
"@mantine/hooks": "7.16.1",
38-
"@mantine/notifications": "7.16.1",
39-
"@mantine/tiptap": "7.16.1",
40-
"@tiptap/extension-highlight": "2.11.3",
41-
"@tiptap/extension-subscript": "2.11.3",
42-
"@tiptap/extension-superscript": "2.11.3",
43-
"@tiptap/extension-text-align": "2.11.3",
44-
"@tiptap/extension-underline": "2.11.3",
45-
"@tiptap/starter-kit": "2.11.3",
46-
"i18n-iso-countries": "7.13.0",
33+
"@mantine/core": "7.17.0",
34+
"@mantine/dates": "7.17.0",
35+
"@mantine/dropzone": "7.17.0",
36+
"@mantine/form": "7.17.0",
37+
"@mantine/hooks": "7.17.0",
38+
"@mantine/notifications": "7.17.0",
39+
"@mantine/tiptap": "7.17.0",
40+
"@tiptap/extension-highlight": "2.11.5",
41+
"@tiptap/extension-subscript": "2.11.5",
42+
"@tiptap/extension-superscript": "2.11.5",
43+
"@tiptap/extension-text-align": "2.11.5",
44+
"@tiptap/extension-underline": "2.11.5",
45+
"@tiptap/starter-kit": "2.11.5",
46+
"i18n-iso-countries": "7.14.0",
4747
"jszip": "3.10.1",
4848
"jwt-decode": "4.0.0",
4949
"keycloak-js": "25.0.6",
@@ -52,42 +52,42 @@
5252
"react": "18.3.1",
5353
"react-avatar-editor": "13.0.2",
5454
"react-dom": "18.3.1",
55-
"react-router": "7.1.3"
55+
"react-router": "7.2.0"
5656
},
5757
"devDependencies": {
58-
"@eslint/compat": "1.2.5",
58+
"@eslint/compat": "1.2.6",
5959
"@eslint/eslintrc": "3.2.0",
60-
"@eslint/js": "9.18.0",
60+
"@eslint/js": "9.20.0",
6161
"@types/react": "18.3.18",
6262
"@types/react-avatar-editor": "13.0.3",
6363
"@types/react-dom": "18.3.5",
64-
"@typescript-eslint/eslint-plugin": "8.21.0",
65-
"@typescript-eslint/parser": "8.21.0",
64+
"@typescript-eslint/eslint-plugin": "8.24.1",
65+
"@typescript-eslint/parser": "8.24.1",
6666
"clean-webpack-plugin": "4.0.0",
6767
"compression-webpack-plugin": "11.1.0",
6868
"copy-webpack-plugin": "12.0.2",
6969
"css-loader": "7.1.2",
7070
"css-minimizer-webpack-plugin": "7.0.0",
71-
"eslint": "9.18.0",
71+
"eslint": "9.20.1",
7272
"eslint-config-prettier": "10.0.1",
7373
"eslint-plugin-prettier": "5.2.3",
7474
"eslint-plugin-react": "7.37.4",
7575
"fork-ts-checker-webpack-plugin": "9.0.2",
76-
"globals": "15.14.0",
76+
"globals": "15.15.0",
7777
"html-webpack-plugin": "5.6.3",
7878
"mini-css-extract-plugin": "2.9.2",
79-
"postcss": "8.5.1",
79+
"postcss": "8.5.3",
8080
"postcss-loader": "8.1.1",
8181
"postcss-preset-mantine": "1.17.0",
82-
"prettier": "3.4.2",
82+
"prettier": "3.5.1",
8383
"speed-measure-webpack-plugin": "1.5.0",
8484
"style-loader": "4.0.0",
8585
"terser-webpack-plugin": "5.3.11",
8686
"ts-loader": "9.5.2",
8787
"ts-node": "10.9.2",
8888
"typescript": "5.7.3",
8989
"typescript-plugin-css-modules": "5.1.0",
90-
"webpack": "5.97.1",
90+
"webpack": "5.98.0",
9191
"webpack-bundle-analyzer": "4.10.2",
9292
"webpack-cli": "6.0.1",
9393
"webpack-dev-server": "5.2.0",

docker-compose.prod.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.8"
22

33
services:
44
reverse-proxy:
5-
image: traefik:v3.2
5+
image: traefik:v3.3
66
command:
77
- "--providers.docker=true"
88
- "--providers.docker.exposedByDefault=false"
@@ -115,7 +115,7 @@ services:
115115
- thesis-management-network
116116

117117
db:
118-
image: "postgres:17.1-alpine"
118+
image: "postgres:17.2-alpine"
119119
container_name: thesis-management-db
120120
environment:
121121
- POSTGRES_USER=${SPRING_DATASOURCE_USERNAME}

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
db:
3-
image: 'postgres:17.1-alpine'
3+
image: 'postgres:17.2-alpine'
44
container_name: thesis-management-db
55
volumes:
66
- ./db_backups:/db_backups

docs/PRODUCTION.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ environment:
7575
7676
## Reverse Proxy
7777
```yaml
78-
image: traefik:v3.2
78+
image: traefik:v3.3
7979
command:
8080
- "--providers.docker=true"
8181
- "--providers.docker.exposedByDefault=false"
@@ -109,4 +109,4 @@ There is an example script [thesis-management-backup.sh](../thesis-management-ba
109109

110110
All further environment variables can be found [here](CONFIGURATION.md)
111111

112-
If you want to modify the emails, you can read about that [here](MAILS.md)
112+
If you want to modify the emails, you can read about that [here](MAILS.md)

0 commit comments

Comments
 (0)