Merge remote-tracking branch 'origin/dev' into dev_cpp_code_conversion

2d57794b · Beuster · 040af2d2 · 660255ab · 040af2d2 · 040af2d2
Commit 2d57794b authored Mar 25, 2025 by Beuster
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/Logo.png
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/Logo.png
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/META-INF/persistence.xml
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/META-INF/persistence.xml
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/hibernate.cfg.xml
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/hibernate.cfg.xml
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/log4j2.xml
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/resources/log4j2.xml
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/BMBF_Logo.png
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/BMBF_Logo.png
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/Beuth-Logo_basis.png
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/Beuth-Logo_basis.png
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/WEB-INF/web.xml
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/WEB-INF/web.xml
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/all.min.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/all.min.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/app.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/app.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.bundle.min.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.bundle.min.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.bundle.min.js.map
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.bundle.min.js.map
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.min.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.min.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.min.css.map
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap.min.css.map
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap4-toggle.min.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap4-toggle.min.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap4-toggle.min.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/bootstrap4-toggle.min.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/cd_logo.png
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/cd_logo.png
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/cd_scripts.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/cd_scripts.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/dropzone.min.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/dropzone.min.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/dropzone.min.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/dropzone.min.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/gl-matrix-min.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/gl-matrix-min.js