Lukas Ettel 91e745e939 Merge remote-tracking branch 'origin/master' into refactor-controllerService ...

# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java

2020-03-26 13:57:10 +01:00

..

templates

Merge remote-tracking branch 'origin/master' into refactor-controllerService

2020-03-26 13:57:10 +01:00

application-dev.properties

link is now displayed correctly but still issus with localhost and keykloak

2020-03-23 16:53:32 +01:00

application-docker.properties

Formatting

2020-03-18 20:18:03 +01:00

application.properties

update KeyCloakConfig like in the KeycloakDemo

2020-03-16 15:16:43 +01:00

data.sql

temporarily disable tests + rough change from groupid to uuid + remove invitelink old system

2020-03-23 16:17:17 +01:00

schema.sql

temporarily disable tests + rough change from groupid to uuid + remove invitelink old system

2020-03-23 16:17:17 +01:00