1
Commit Graph

11 Commits

Author SHA1 Message Date
2d3e935d64 merged with master and fixed some problems 2020-03-24 16:31:55 +01:00
4b6257c9f0 set exceptions on join group
added emoji to error.html <- wichtig

                                                          Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
2020-03-24 15:24:24 +01:00
ef044cbdf7 Merge remote-tracking branch 'origin/master' into csv-error-handling
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/templates/createStudent.html
2020-03-19 17:01:32 +01:00
cd1d7183e7 Add exceptions for csv errors 2020-03-19 16:51:40 +01:00
fd4c4ba0f1 Merge pull request #107 from hhu-propra2/entadminisierung
Entadminisierung
2020-03-19 16:45:26 +01:00
5917d9b0fc fixed exeptionname
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
2020-03-19 16:42:27 +01:00
a1e976a805 add exception 2020-03-19 15:30:19 +01:00
68ec062fdb crated an exeption 2020-03-19 14:39:54 +01:00
1c5139da8c Merge refactor into error-handling + fix merge errors
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 23:45:07 +01:00
849c94481c Merge branch 'refactoring' into error-handling
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
#	src/main/java/mops/gruppen2/domain/Group.java
#	src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
#	src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/Event.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
#	src/main/java/mops/gruppen2/domain/exception/EventException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
#	src/main/java/mops/gruppen2/domain/exception/NoValueException.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/main/java/mops/gruppen2/service/UserService.java
#	src/main/resources/templates/errorRenameLater.html
2020-03-18 23:40:39 +01:00
79de4a8540 renaming
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:40:36 +01:00