|
|
5029f01ece
|
Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
# Conflicts:
# src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
|
2020-03-06 14:32:20 +01:00 |
|
|
|
bdd2fc37a9
|
changed name for html file
|
2020-03-06 14:30:56 +01:00 |
|
|
|
b499ae6c06
|
Merge branch 'Services' into html-gruppe
# Conflicts:
# src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
# src/main/java/mops/gruppen2/entities/Admin.java
# src/main/java/mops/gruppen2/entities/Gruppe.java
# src/main/java/mops/gruppen2/entities/GruppeRepository.java
# src/main/java/mops/gruppen2/entities/Student.java
# src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java
|
2020-03-06 14:29:37 +01:00 |
|
|
|
c5b970ffc9
|
change index.html
|
2020-03-06 14:21:43 +01:00 |
|
|
|
166e3bb5fb
|
Merge branch 'Services' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into Services
|
2020-03-06 14:21:35 +01:00 |
|
|
|
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 |
|
|
|
18412accf8
|
change index.html
|
2020-03-06 13:18:53 +01:00 |
|
|
|
7dc7fafed7
|
change index.html
|
2020-03-05 19:04:27 +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 |
|
|
|
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 |
|
