Commit Graph
578 Commits
Author SHA1 Message Date
AndiBuls 0a751c58b6 added index.html 2020-03-05 14:18:17 +01:00
killerber4tandGitHub 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
Christoph 3842ee1739 disable csrf + headers.frameoptions, permit /h2-console/** 2020-03-05 14:07:41 +01:00
killerber4tandGitHub 3de9736719 Merge pull request #28 from hhu-propra2/DTO
add DTOs
2020-03-05 14:01:53 +01:00
tomvahl aecba724b4 change name 2020-03-05 13:59:24 +01:00
tomvahl 3bc6f76b65 add DTOs 2020-03-05 13:55:34 +01:00
ChristophandGitHub 63e1c3027d Merge pull request #27 from hhu-propra2/fix-app-prop
fix app prop
2020-03-05 13:54:56 +01:00
killerber4t c2b31dd255 fix styleguide 2020-03-05 13:49:44 +01:00
killerber4t 9c49cdec5e add keycloak to app.-prop 2020-03-05 13:43:22 +01:00
ChristophandGitHub 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
ChristophandGitHub d208e7dd30 Merge branch 'master' into spring-profiles 2020-03-05 13:39:04 +01:00
killerber4tandGitHub 737f65c91f Merge pull request #26 from hhu-propra2/workflow-paths-ignore
don't check documentation paths
2020-03-05 13:38:36 +01:00
ChristophandGitHub 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
ChristophandGitHub caca05bd95 don't check documentation paths 2020-03-05 13:35:21 +01:00
Christoph 2d729686bb add initial simplified schema + h2-console spring-security + h2 password 2020-03-05 13:24:58 +01:00
killerber4tandGitHub 0d4d6259e6 Merge branch 'master' into spring-profiles 2020-03-05 13:22:10 +01:00
killerber4t 964e0ed81f added spring profile dev (prod still empty) 2020-03-05 13:20:33 +01:00
Lukas EttelandGitHub ca28f041f5 Merge pull request #23 from hhu-propra2/keycloak
Keycloak
2020-03-05 13:07:59 +01:00
Mahgs 9bd0b00f9e fixed keycloak import 2020-03-05 12:59:20 +01:00
Mahgs cd15c29027 Merge remote-tracking branch 'origin/master' into keycloak 2020-03-04 16:58:31 +01:00
Mahgs 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
tomvahlandGitHub 615eb37cda Merge pull request #20 from hhu-propra2/gruppenbildung
Gruppenbildung
2020-03-04 16:49:05 +01:00
killerber4tandGitHub 4e1a55e5ce Merge pull request #21 from hhu-propra2/checkstyle-no-import-order
Checkstyle no import order
2020-03-04 16:46:49 +01:00
Mahgs 0b9a151fc9 fixed Account 2020-03-04 16:44:55 +01:00
Christoph c91d28735c remove check for import order 2020-03-04 16:44:52 +01:00
Mahgs dabe3bedc5 fixed Account 2020-03-04 16:29:01 +01:00
killerber4t 5122a2c83d change organisator to admin 2020-03-04 16:12:06 +01:00
killerber4t a58b439a1d add entities: Gruppe, Organisator, Student, Teilnehmer 2020-03-04 15:58:05 +01:00
Mahgs 724ed2d85f added keycloak authentification and account 2020-03-04 15:56:27 +01:00
Christoph 9739354279 dockerfile to build and run application 2020-03-04 15:27:39 +01:00
Mahgs 4c1c26e817 added keycloak authentification and account 2020-03-04 15:06:12 +01:00
ChristophandGitHub d5033a22ca Merge pull request #18 from hhu-propra2/swagger-api
Swagger api added
2020-03-04 14:24:53 +01:00
ChristophandGitHub 3f3dd0c9f6 Merge branch 'master' into swagger-api 2020-03-04 14:23:14 +01:00
killerber4tandGitHub 42fad4db3f Merge pull request #19 from hhu-propra2/churl-build.gradle
slight change to spotbugs config
2020-03-04 14:20:08 +01:00
killerber4tandGitHub 3ce45523ba Delete SecurityConfig.java 2020-03-04 14:12:45 +01:00
killerber4tandGitHub e1ad60ef0b Delete KeycloakConfig.java 2020-03-04 14:11:51 +01:00
killerber4tandGitHub 447860ca13 Merge branch 'master' into swagger-api 2020-03-04 14:09:43 +01:00
Mahgs 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
ChristophandGitHub cd18fa8cb4 Merge pull request #17 from hhu-propra2/gruppen2-html
Add controller, index.html, admin in application.properties
2020-03-04 13:58:01 +01:00
XXNitram 6a3483db9d add RequestMapping 2020-03-04 13:56:12 +01:00
XXNitram 13af32cff4 add controller, index.html, admin in application.properties 2020-03-04 13:45:37 +01:00
killerber4t 13401df0ac fix more conflicts 2020-03-04 13:45:36 +01:00
killerber4t 89196b738a fix conflicts 2020-03-04 13:44:27 +01:00
killerber4t ffabc5ce53 add swagger-API and example controller 2020-03-04 13:42:45 +01:00
tomvahlandGitHub 0cf49a55a2 Merge pull request #14 from hhu-propra2/ChUrl-CI-caching
add ci caching
2020-03-04 13:11:25 +01:00
Christoph d4f11f4531 slight change to spotbugs config 2020-03-04 13:09:48 +01:00
ChristophandGitHub 6c238dae97 add ci caching 2020-03-03 21:37:59 +01:00
XXNitramandGitHub 7940988e98 Merge pull request #12 from hhu-propra2/styleguide
Styleguide
2020-03-03 16:58:09 +01:00
XXNitram 775ee68c79 fix style guide dependencies 2020-03-03 16:45:21 +01:00
killerber4t ec69171458 add keycloak 2020-03-03 16:44:05 +01:00