1
Commit Graph

59 Commits

Author SHA1 Message Date
bd9e1bb28e add Join Group
Mitgearbeitet hat:
Karla
Andi
2020-03-17 15:11:40 +01:00
c052ec6ae6 refactor code
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:58:02 +01:00
61e007e4d8 add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:36:55 +01:00
325c5d84f9 Merge branch 'master' into change-to-polymorphie 2020-03-17 13:05:20 +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
06fa9f5284 change UpdateRoleEvent 2020-03-16 15:45:26 +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
22eede051b change CreateGroupEvent
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
2020-03-16 15:36:28 +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
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
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
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
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
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
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
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
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
a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
c6c62b07bf created first API implementation 2020-03-12 13:52:50 +01:00
9b004bef58 Create new package config and move Gruppen2Config to it 2020-03-12 13:14:22 +01:00
846eee9606 refactor tests for new events 2020-03-11 16:10:58 +01:00
c0d2bbbf7f Added DeleteGroupEvent and GroupDoesNotExistException 2020-03-10 15:09:35 +01:00
3113483b31 change GroupService 2020-03-10 14:37:11 +01:00
3c410b2de4 create group with UI 2020-03-10 14:27:45 +01:00
73e7737b8c restore things lost in merge ffs 2020-03-10 13:34:19 +01:00
c7d5e02f0b Merge remote-tracking branch 'origin/event-db'
# Conflicts:
#	src/main/java/mops/gruppen2/domain/Aggregate.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/domain/GroupTest.java
2020-03-10 13:24:29 +01:00
98bbc0add6 Merge branch 'event-db' into html-gruppe 2020-03-10 13:04:14 +01:00
5f8d9a8603 change SerializationServiceTest 2020-03-10 13:02:06 +01:00
a8f2fa32a7 Merge branch 'event-db' into html-gruppe 2020-03-09 23:34:34 +01:00
61e2d0edba added Creating Groups to frontend and saving them in Database. Also prepared some Methods for Snapshot db 2020-03-09 23:21:29 +01:00
8e41d114a5 Update and rename SwaggerAPIControllerExample.java to SwaggerAPIController.java 2020-03-09 16:54:58 +01:00
a40ef0396d Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. 2020-03-09 16:47:46 +01:00