1
Commit Graph

148 Commits

Author SHA1 Message Date
aa67bd2e88 Add missing service
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-17 16:55:32 +01:00
6e067d1b47 Fix InviteLink DB Schema + Implement Frontend InviteLink Handling
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-17 16:16:58 +01:00
906585ce9a added InviteLinkRepository
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-17 13:42:35 +01:00
e045dc54ee Add InviteLinkDTO + add dto folder
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-17 13:33:02 +01:00
d0a42c4569 Merge remote-tracking branch 'origin/master' into keycloakRestApi 2020-03-16 16:18:25 +01:00
7e2c1dec81 tested APIController
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-16 16:16:46 +01:00
e12f0c1d59 added @Secured and fixed
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
2020-03-16 15:40:46 +01:00
3f144d14e4 update KeyCloakConfig like in the KeycloakDemo
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
2020-03-16 15:16:43 +01:00
7c3942c10d Merge branch 'master' into details-templates 2020-03-16 14:53:19 +01:00
54d5028693 Add template for detailsNoMember.html, that displays the details when you search a page.
Add connection to the controller
2020-03-16 13:31:51 +01:00
db11bdb8a9 Merge remote-tracking branch 'origin/master' into EventServiceTests
# Conflicts:
#	src/test/java/mops/gruppen2/service/EventServiceTest.java
2020-03-16 13:14:10 +01:00
e2978e10d0 fix visibility in controller 2020-03-16 12:37:45 +01:00
1ad3ad8bab Merge remote-tracking branch 'origin/UI-Improvements'
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
2020-03-14 23:47:41 +01:00
264d4ad052 fix problem where search was keeping same search throughout session and some UI changes 2020-03-14 23:29:49 +01:00
d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +01:00
d939631eac Update EventRepository.java 2020-03-14 09:31:48 +01:00
403b32ed76 Update EventRepository.java 2020-03-14 09:30:49 +01:00
434a69f93d Merge branch 'master' into change_DTO 2020-03-14 09:28:39 +01:00
fa79b3f136 change EventDTO, add AddUserEventController, add the search function in UI and backend 2020-03-14 09:17:32 +01:00
3d7681fc8f add more UI improvements and functionality 2020-03-14 02:03:08 +01:00
3849b61614 add some UI-improvements and functionality 2020-03-14 01:11:56 +01:00
778ec3d1aa Merge pull request #68 from hhu-propra2/group-details
Group details
2020-03-13 16:50:47 +01:00
a34c119113 Update UpdateRoleEvent.java 2020-03-13 16:41:27 +01:00
316352c3b9 Fixed the Logout Button 2020-03-13 16:38:32 +01:00
e5b69c0cc0 Merge branch 'master' into group-details 2020-03-13 16:36:13 +01:00
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +01:00
86622b4a0c add cases for different roles and visibility 2020-03-13 16:07:12 +01:00
68fcc06a17 add details page 2020-03-13 15:11:23 +01:00
8ce3fc39b1 quick refactor 2020-03-13 14:42:17 +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
b8fe1bf29a Merge remote-tracking branch 'origin/master' into updateGroupsAPI
# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
2020-03-13 13:52:53 +01:00
d1f296129d Impletended SwaggerApi with all provisionally funktiontionallitys 2020-03-13 13:50:49 +01:00
26f26a1c1a Add JavaDoc comments to SerializationService 2020-03-13 13:47:05 +01:00
6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +01:00
1754486625 Merge remote-tracking branch 'origin/master' into updateGroupsAPI
# Conflicts:
#	src/main/java/mops/gruppen2/repository/EventRepository.java
2020-03-12 16:31:23 +01:00
4e874bf6e2 Impletended the updategroup(status) method in the API 2020-03-12 16:27:52 +01:00
6f213af10e Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:18:25 +01:00
80a9566d6f Add ControllerService and refactor Gruppen2Controller 2020-03-12 16:18:15 +01:00
9795c10c14 Impletended the updategroup(status) method in the API 2020-03-12 16:11:32 +01:00
768b053a03 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:03:48 +01:00
e31c9cf522 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:46:14 +01:00
d5b1ac2429 slight change to controller redirect 2020-03-12 15:31:59 +01:00
70d911c576 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent to Gruppen2Controller 2020-03-12 15:22:10 +01:00
9f40df9d59 add Usergroups to controller 2020-03-12 15:14:46 +01:00
77b6ba247d add comments 2020-03-12 15:13:56 +01:00
a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
8c0975def3 fix queries 2020-03-12 14:55:32 +01:00
528ca1a2c0 refactor projecteventlist 2020-03-12 14:46:41 +01:00