1
Commit Graph

493 Commits

Author SHA1 Message Date
43a3282b67 added functionality to choose wether group is private or open 2020-03-14 22:54:40 +01:00
d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +01:00
63279d8fe6 Merge pull request #72 from hhu-propra2/change_DTO
change EventDTO, add AddUserEventController, add the search function …
2020-03-14 09:33:33 +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
c4f90e0baf Merge pull request #70 from hhu-propra2/group-create
Group create
2020-03-13 23:07:36 +01:00
94317af298 Merge branch 'master' into group-create 2020-03-13 16:59:00 +01:00
599208cc79 created dropdown for Veranstaltung 2020-03-13 16:51:10 +01:00
778ec3d1aa Merge pull request #68 from hhu-propra2/group-details
Group details
2020-03-13 16:50:47 +01:00
b09feabc09 Merge pull request #69 from hhu-propra2/fixingLogoutButton
Fixed the Logout Button
2020-03-13 16:43:53 +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
bfa008f9ef Add file to display group details for non-members 2020-03-13 16:31:50 +01:00
ad372c374a Add page titles 2020-03-13 16:31:15 +01:00
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
a8adbbb31c Merge pull request #67 from hhu-propra2/readme
update readme
2020-03-13 16:18:16 +01:00
0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +01:00
e48c1a78bb update readme 2020-03-13 16:10:16 +01:00
e870733b37 Merge remote-tracking branch 'origin/group-details' into group-details 2020-03-13 16:09:25 +01:00
a1cc13eb00 change create 2020-03-13 16:08:47 +01:00
86622b4a0c add cases for different roles and visibility 2020-03-13 16:07:12 +01:00
389cda5bc3 made visibility and groupType checkboxes 2020-03-13 15:49:12 +01:00
68fcc06a17 add details page 2020-03-13 15:11:23 +01:00
eb969521d6 Merge pull request #66 from hhu-propra2/quickSwaggerAndUserRolesImpovement
quick refactor
2020-03-13 14:45:16 +01:00
8ce3fc39b1 quick refactor 2020-03-13 14:42:17 +01:00
eb43af6bec added buttons for visibility option 2020-03-13 14:33:41 +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
7bbdbad28e Add details.html to display group details 2020-03-13 14:27:38 +01:00
5fa80753c2 Merge pull request #65 from hhu-propra2/updateGroupsAPI
Update groups api
2020-03-13 13:57:56 +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
9a802b2f85 Merge pull request #64 from hhu-propra2/refactor-controller-service
Refactor controller service and add comments
2020-03-13 13:50:59 +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
cd60dca352 Merge pull request #63 from hhu-propra2/controller-fix
add new Controller to redirect
2020-03-12 16:58:30 +01:00
8f0b939037 Merge branch 'controller-fix' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into controller-fix 2020-03-12 16:55:21 +01:00
d3ba609e6a fix ControllerTest 2020-03-12 16:54:42 +01:00
2b7a9a3802 Merge branch 'master' into controller-fix 2020-03-12 16:49:33 +01:00
430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +01:00
591966f14c Merge pull request #62 from hhu-propra2/groups-for-user
Groups for user
2020-03-12 16:37:13 +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
ca360b1596 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:26:31 +01:00
c73cf2a870 change color of submit button in search.html and create.html 2020-03-12 16:25:39 +01:00
c8f24f834d Merge pull request #61 from hhu-propra2/groups-for-user
Groups for user
2020-03-12 16:25:36 +01:00