1
Commit Graph

379 Commits

Author SHA1 Message Date
aecba724b4 change name 2020-03-05 13:59:24 +01:00
3bc6f76b65 add DTOs 2020-03-05 13:55:34 +01:00
c2b31dd255 fix styleguide 2020-03-05 13:49:44 +01:00
9c49cdec5e add keycloak to app.-prop 2020-03-05 13:43:22 +01:00
d208e7dd30 Merge branch 'master' into spring-profiles 2020-03-05 13:39:04 +01:00
2d729686bb add initial simplified schema + h2-console spring-security + h2 password 2020-03-05 13:24:58 +01:00
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
cd15c29027 Merge remote-tracking branch 'origin/master' into keycloak 2020-03-04 16:58:31 +01:00
e5959cb435 Merge remote-tracking branch 'origin/master' into keycloak
# Conflicts:
#	build.gradle
#	src/main/java/mops/gruppen2/security/KeycloakConfig.java
#	src/main/resources/application.properties
2020-03-04 16:56:40 +01:00
0b9a151fc9 fixed Account 2020-03-04 16:44:55 +01:00
dabe3bedc5 fixed Account 2020-03-04 16:29:01 +01:00
5122a2c83d change organisator to admin 2020-03-04 16:12:06 +01:00
a58b439a1d add entities: Gruppe, Organisator, Student, Teilnehmer 2020-03-04 15:58:05 +01:00
724ed2d85f added keycloak authentification and account 2020-03-04 15:56:27 +01:00
4c1c26e817 added keycloak authentification and account 2020-03-04 15:06:12 +01:00
3ce45523ba Delete SecurityConfig.java 2020-03-04 14:12:45 +01:00
e1ad60ef0b Delete KeycloakConfig.java 2020-03-04 14:11:51 +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
6a3483db9d add RequestMapping 2020-03-04 13:56:12 +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
382276348a Merge pull request #10 from hhu-propra2/applicationp
add h2 support and logging pattern to AP
2020-03-03 15:59:33 +01:00
939e35e740 add h2 support and logging pattern to AP 2020-03-03 15:54:59 +01:00
ec1c666239 fixed checkstyle.xml 2020-03-03 15:41:46 +01:00
249ec333b2 fix folders 2020-03-03 14:13:02 +01:00