Compare commits

...

4 commits
v1.3.0 ... main

Author SHA1 Message Date
abce057ad3 1.3.1 2025-04-22 14:00:14 +02:00
d6ec838e0e Merge pull request 'patches v1.3.1' (#8) from develop into main
Reviewed-on: #8
2025-04-22 11:59:31 +00:00
22c95b4517 Merge branch 'main' into develop
# Conflicts:
#	package-lock.json
2025-04-22 13:59:16 +02:00
76786ef0c4 fix: enable pg as database 2025-04-22 09:37:03 +02:00
2 changed files with 4 additions and 3 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "webpage-cms", "name": "webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "webpage-cms", "name": "webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"dependencies": { "dependencies": {
"@offset-dev/strapi-calendar": "^1.0.0", "@offset-dev/strapi-calendar": "^1.0.0",
"@strapi/plugin-color-picker": "5.12.5", "@strapi/plugin-color-picker": "5.12.5",

View file

@ -1,6 +1,6 @@
{ {
"name": "ff-webpage-cms", "name": "ff-webpage-cms",
"version": "1.3.0", "version": "1.3.1",
"private": true, "private": true,
"description": "Feuerwehr/Verein Webseite CMS", "description": "Feuerwehr/Verein Webseite CMS",
"scripts": { "scripts": {
@ -18,6 +18,7 @@
"@strapi/plugin-users-permissions": "5.12.5", "@strapi/plugin-users-permissions": "5.12.5",
"@strapi/strapi": "5.12.5", "@strapi/strapi": "5.12.5",
"mysql2": "3.9.8", "mysql2": "3.9.8",
"pg": "^8.14.1",
"react": "^18.0.0", "react": "^18.0.0",
"react-dom": "^18.0.0", "react-dom": "^18.0.0",
"react-router-dom": "^6.0.0", "react-router-dom": "^6.0.0",