Merge branch 'dev' into 'master'

Version 3.17.0 Release See merge request !28

Merge branch 'dev' into 'master'
Version 3.17.0 Release See merge request !28
3dac795e · Riegel · 2bf3cfb6 · 660255ab · 2bf3cfb6 · 2bf3cfb6
Commit 3dac795e authored 5 days ago by Riegel
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 33 additions and 2975 deletions
+33 -2975
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/gl_debug.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/gl_debug.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/hft_logo.png
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/hft_logo.png
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/index.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/index.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/index.html
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/index.html
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/internal_server_error.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/internal_server_error.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/internal_server_error.html
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/internal_server_error.html
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/jquery-3.4.1.min.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/jquery-3.4.1.min.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models.css
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models.css
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models.html
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models.html
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models_scripts.js
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/main/webapp/models_scripts.js
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/BuildingEndpointTest.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/BuildingEndpointTest.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/LoginEndpointTest.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/LoginEndpointTest.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/LoginValues.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/LoginValues.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/ModelsEndpointTest.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/ModelsEndpointTest.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/RegisterEndpointTest.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/RegisterEndpointTest.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/TestUtils.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/TestUtils.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/ValidationEndpointTest.java
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/java/de/hft/stuttgart/citydoctor2/webservice/endpoints/ValidationEndpointTest.java
--- a/CityDoctorParent/Extensions/CityDoctorWebService/src/test/resources/testConfig.yml
+++ b/CityDoctorParent/Extensions/CityDoctorWebService/src/test/resources/testConfig.yml
--- a/CityDoctorParent/Extensions/README.md
+++ b/CityDoctorParent/Extensions/README.md
--- a/CityDoctorParent/pom.xml
+++ b/CityDoctorParent/pom.xml