1
Commit Graph

19 Commits

Author SHA1 Message Date
de0e8ee4fe fixed some problems in WebController 2020-03-26 13:48:17 +01:00
81b93266e5 fixed checkstyle problems 2020-03-25 16:36:37 +01:00
dbfa260c4d Refactor after merge with master
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
2020-03-25 16:07:31 +01:00
2c70deeb7b Merge remote-tracking branch 'origin/master' into add-ValidationService
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
2020-03-25 15:51:10 +01:00
0c43050166 Refactor WebController and ValidationService
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
2020-03-25 15:43:41 +01:00
dd7404553c Merge pull request #135 from hhu-propra2/fix_createGroup
Fix create group
2020-03-25 14:50:41 +01:00
74038428df Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users
Fix group search number of users
2020-03-25 14:48:26 +01:00
22ae8a81dc partial fix search: max user anzahl display
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
2020-03-25 14:46:02 +01:00
be37fcbd50 add Exceptions
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
2020-03-25 14:40:59 +01:00
1dd3f9b6fe create ValidationService
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-25 14:08:00 +01:00
062a0505be Deleted the html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
2020-03-25 14:03:12 +01:00
8e914d8011 Refactoring 2020-03-25 13:36:47 +01:00
f4935b9a33 Merge remote-tracking branch 'origin/master' into fix-group-search-number-of-users
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/resources/templates/detailsMember.html
#	src/main/resources/templates/search.html
2020-03-25 13:32:47 +01:00
551534d4ff Merge branch 'master' into refactor-controller
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
2020-03-25 13:03:22 +01:00
f0a1a9c7bb refactor Controller 2020-03-24 16:16:18 +01:00
d957326491 refactor Controller 2020-03-24 16:02:16 +01:00
f907c617a8 refactor WebController 2020-03-24 15:57:31 +01:00
46aaf3658e refactor createOrga Method in ControllerService 2020-03-24 15:36:52 +01:00
1146308752 rename file 2020-03-24 15:21:55 +01:00