Commit Graph
611 Commits
Author SHA1 Message Date
Christoph b1d266d7bf change user_id to String + add updateRoleEvent 2020-03-06 15:58:35 +01:00
killerber4t 991287527e add test to addUser-Event 2020-03-06 15:58:12 +01:00
LukasEttel 84b2866e42 Merge remote-tracking branch 'origin/Services' into Services
# Conflicts:
#	src/main/java/mops/gruppen2/services/GruppenService.java
2020-03-06 15:53:34 +01:00
Mahgs 02456e9a88 added DeleteUserEvent 2020-03-06 15:52:15 +01:00
LukasEttel 131bf6c5b7 created createGroup - test 2020-03-06 15:47:38 +01:00
killerber4t 32bdbeec51 add Event Adduser 2020-03-06 15:25:42 +01:00
XXNitram 82552a82b2 Merge remote-tracking branch 'origin/Services' into Services 2020-03-06 15:12:55 +01:00
XXNitram 60446f4789 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent 2020-03-06 15:12:39 +01:00
AndiBuls d218056649 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 15:04:34 +01:00
tomvahl 2645e4dd84 change create.html index.html and search.html 2020-03-06 14:58:31 +01:00
LukasEttel 2143fe814b created GruppTest 2020-03-06 14:49:05 +01:00
tomvahl e4d91e53f5 Merge branch 'Services' into html-gruppe 2020-03-06 14:47:54 +01:00
Christoph 1ddfab0091 rename events package, add aggregat superclass 2020-03-06 14:40:55 +01:00
tomvahl 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
AndiBuls bdd2fc37a9 changed name for html file 2020-03-06 14:30:56 +01:00
tomvahl 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
AndiBuls 05a7e72079 Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe 2020-03-06 14:24:18 +01:00
tomvahl c5b970ffc9 change index.html 2020-03-06 14:21:43 +01:00
killerber4t 166e3bb5fb Merge branch 'Services' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into Services 2020-03-06 14:21:35 +01:00
killerber4t 75143b33c0 add Event related stuff and Group example 2020-03-06 14:20:04 +01:00
Christoph 8da29d3749 Merge remote-tracking branch 'origin/Services' into Services 2020-03-06 13:36:00 +01:00
Christoph 761727c8f0 add gruppen2/ prefix to url 2020-03-06 13:35:37 +01:00
Christoph cac32dc672 move createAccountFromPrincipal to service 2020-03-06 13:32:59 +01:00
killerber4t 2ba8176500 add GruppenService and EventRepository and Event object 2020-03-06 13:28:09 +01:00
ChristophandGitHub 66014da7d0 Merge pull request #31 from hhu-propra2/styleguide-versions
update styleguide
2020-03-06 13:23:10 +01:00
AndiBuls d0d9bc91b5 Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe 2020-03-06 13:19:33 +01:00
killerber4t db3713f955 update styleguide 2020-03-06 13:19:03 +01:00
tomvahl 18412accf8 change index.html 2020-03-06 13:18:53 +01:00
AndiBuls 480f893f56 Merge branch 'master' into html-gruppe 2020-03-06 13:18:07 +01:00
tomvahl 7dc7fafed7 change index.html 2020-03-05 19:04:27 +01:00
Lukas EttelandGitHub b7d9b2d702 Merge pull request #30 from hhu-propra2/checkbugsFixReportLevel
Fixed the report-level of spotbugs
2020-03-05 16:51:44 +01:00
LukasEttel e9ff581083 geupdated für keycloak 2020-03-05 16:44:36 +01:00
tomvahl 4b51e29edb fix html 2020-03-05 16:36:21 +01:00
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