1
Commit Graph

23 Commits

Author SHA1 Message Date
98607dcf49 remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:15:22 +01:00
d0114a5a58 Merge remote-tracking branch 'origin/master' into JavaDocComments
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/EventService.java
#	src/main/java/mops/gruppen2/service/UserService.java
2020-03-27 14:56:41 +01:00
56a81ce66f caching
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-27 12:57:47 +01:00
02e7bcbcc4 fix api
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 21:19:59 +01:00
eb59a70dd4 added javaDoc for UserService 2020-03-26 13:32:48 +01:00
ed4a9b5728 add badges in group lists
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-25 15:46:58 +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
2d3e935d64 merged with master and fixed some problems 2020-03-24 16:31:55 +01:00
80ab65febb update UserService 2020-03-24 15:38:06 +01:00
d562df8826 temporarily disable tests + rough change from groupid to uuid + remove invitelink old system 2020-03-23 16:17:17 +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
a05ffe9e4c Fix Checkstyle Errors :(
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 23:17:57 +01:00
79de4a8540 renaming
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:40:36 +01:00
e4d8fb05cb removed unneccessary fields, decreased field visibility
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 21:32:05 +01:00
2ba913f2c8 Formatting
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 20:18:03 +01:00
df7803f83d add error handling (frontend) + exception changes
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: Mahgs <maxoerter@gmx.de>
2020-03-18 16:27:24 +01:00
61e007e4d8 add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:36:55 +01:00
eeded221b4 Add method to find group by id
Add method to connect details.html to the controller
2020-03-13 14:28:16 +01:00
430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +01:00
a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
a775040abe add 2 new Queries and 2 Methods for UserService 2020-03-12 13:55:10 +01:00