AndiBuls a140cd22a0 Merge branch 'master' into refactor-controllerService ...

# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java

2020-03-25 16:45:01 +01:00

..

APIFormatterService.java

Fix Checkstyle Errors :(

2020-03-18 23:17:57 +01:00

ControllerService.java

Merge branch 'master' into refactor-controllerService

2020-03-25 16:45:01 +01:00

CsvService.java

Add Service Annotation

2020-03-18 14:43:26 +01:00

EventService.java

Merge branch 'master' into killertester

2020-03-25 15:52:53 +01:00

GroupService.java

Merge remote-tracking branch 'origin/master' into group-list-ordering

2020-03-25 16:09:46 +01:00

JsonService.java

Fix Checkstyle Errors :(

2020-03-18 23:17:57 +01:00

KeyCloakService.java

slight changes to package structure + naming

2020-03-06 20:10:23 +01:00

SearchService.java

prepare search optimization

2020-03-20 16:00:07 +01:00

UserService.java

add badges in group lists

2020-03-25 15:46:58 +01:00

ValidationService.java

Refactor after merge with master

2020-03-25 16:07:31 +01:00