1
Commit Graph

492 Commits

Author SHA1 Message Date
75143b33c0 add Event related stuff and Group example 2020-03-06 14:20:04 +01:00
8da29d3749 Merge remote-tracking branch 'origin/Services' into Services 2020-03-06 13:36:00 +01:00
761727c8f0 add gruppen2/ prefix to url 2020-03-06 13:35:37 +01:00
cac32dc672 move createAccountFromPrincipal to service 2020-03-06 13:32:59 +01:00
2ba8176500 add GruppenService and EventRepository and Event object 2020-03-06 13:28:09 +01:00
66014da7d0 Merge pull request #31 from hhu-propra2/styleguide-versions
update styleguide
2020-03-06 13:23:10 +01:00
d0d9bc91b5 Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe 2020-03-06 13:19:33 +01:00
db3713f955 update styleguide 2020-03-06 13:19:03 +01:00
18412accf8 change index.html 2020-03-06 13:18:53 +01:00
480f893f56 Merge branch 'master' into html-gruppe 2020-03-06 13:18:07 +01:00
7dc7fafed7 change index.html 2020-03-05 19:04:27 +01:00
b7d9b2d702 Merge pull request #30 from hhu-propra2/checkbugsFixReportLevel
Fixed the report-level of spotbugs
2020-03-05 16:51:44 +01:00
e9ff581083 geupdated für keycloak 2020-03-05 16:44:36 +01:00
4b51e29edb fix html 2020-03-05 16:36:21 +01:00
0a751c58b6 added index.html 2020-03-05 14:18:17 +01:00
babac2279d Merge pull request #29 from hhu-propra2/adapt-spring-security-to-h2-console
disable csrf + headers.frameoptions, permit /h2-console/**
2020-03-05 14:09:35 +01:00
3842ee1739 disable csrf + headers.frameoptions, permit /h2-console/** 2020-03-05 14:07:41 +01:00
3de9736719 Merge pull request #28 from hhu-propra2/DTO
add DTOs
2020-03-05 14:01:53 +01:00
aecba724b4 change name 2020-03-05 13:59:24 +01:00
3bc6f76b65 add DTOs 2020-03-05 13:55:34 +01:00
63e1c3027d Merge pull request #27 from hhu-propra2/fix-app-prop
fix app prop
2020-03-05 13:54:56 +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
0d72147d74 Merge pull request #24 from hhu-propra2/spring-profiles
added spring profile dev (prod still empty)
2020-03-05 13:39:28 +01:00
d208e7dd30 Merge branch 'master' into spring-profiles 2020-03-05 13:39:04 +01:00
737f65c91f Merge pull request #26 from hhu-propra2/workflow-paths-ignore
don't check documentation paths
2020-03-05 13:38:36 +01:00
55d6470a21 Merge pull request #25 from hhu-propra2/database-init
add initial simplified schema + h2-console spring-security + h2 password
2020-03-05 13:37:39 +01:00
caca05bd95 don't check documentation paths 2020-03-05 13:35:21 +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
ca28f041f5 Merge pull request #23 from hhu-propra2/keycloak
Keycloak
2020-03-05 13:07:59 +01:00
9bd0b00f9e fixed keycloak import 2020-03-05 12:59:20 +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
615eb37cda Merge pull request #20 from hhu-propra2/gruppenbildung
Gruppenbildung
2020-03-04 16:49:05 +01:00
4e1a55e5ce Merge pull request #21 from hhu-propra2/checkstyle-no-import-order
Checkstyle no import order
2020-03-04 16:46:49 +01:00
0b9a151fc9 fixed Account 2020-03-04 16:44:55 +01:00
c91d28735c remove check for import order 2020-03-04 16:44:52 +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
9739354279 dockerfile to build and run application 2020-03-04 15:27:39 +01:00
4c1c26e817 added keycloak authentification and account 2020-03-04 15:06:12 +01:00
d5033a22ca Merge pull request #18 from hhu-propra2/swagger-api
Swagger api added
2020-03-04 14:24:53 +01:00
3f3dd0c9f6 Merge branch 'master' into swagger-api 2020-03-04 14:23:14 +01:00
42fad4db3f Merge pull request #19 from hhu-propra2/churl-build.gradle
slight change to spotbugs config
2020-03-04 14:20:08 +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