1
Commit Graph

11 Commits

Author SHA1 Message Date
0d4d6259e6 Merge branch 'master' into spring-profiles 2020-03-05 13:22:10 +01:00
964e0ed81f added spring profile dev (prod still empty) 2020-03-05 13:20:33 +01:00
4c1c26e817 added keycloak authentification and account 2020-03-04 15:06:12 +01:00
447860ca13 Merge branch 'master' into swagger-api 2020-03-04 14:09:43 +01:00
4d29d93fd5 Merge remote-tracking branch 'origin/master' into keycloak
# Conflicts:
#	build.gradle
#	src/main/resources/application.properties
2020-03-04 14:00:56 +01:00
13af32cff4 add controller, index.html, admin in application.properties 2020-03-04 13:45:37 +01:00
13401df0ac fix more conflicts 2020-03-04 13:45:36 +01:00
ffabc5ce53 add swagger-API and example controller 2020-03-04 13:42:45 +01:00
ec69171458 add keycloak 2020-03-03 16:44:05 +01:00
939e35e740 add h2 support and logging pattern to AP 2020-03-03 15:54:59 +01:00
249ec333b2 fix folders 2020-03-03 14:13:02 +01:00