Merge branch 'main' into #3-calendar

# Conflicts:
#	package-lock.json
#	src/data-source.ts
#	src/routes/admin/index.ts
#	src/type/permissionTypes.ts
This commit is contained in:
Julian Krauser 2024-11-07 11:09:52 +01:00
commit 98eb870385
48 changed files with 2672 additions and 9 deletions

View file

@ -1,6 +1,6 @@
{
"name": "member-administration-server",
"version": "0.0.2",
"version": "0.0.3",
"description": "Feuerwehr/Verein Mitgliederverwaltung Server",
"main": "dist/index.js",
"scripts": {
@ -34,6 +34,7 @@
"mysql": "^2.18.1",
"node-schedule": "^2.1.1",
"nodemailer": "^6.9.14",
"pdf-creator-node": "^2.3.5",
"qrcode": "^1.5.4",
"reflect-metadata": "^0.2.2",
"socket.io": "^4.7.5",