1
Commit Graph

217 Commits

Author SHA1 Message Date
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
0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +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
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
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
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
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
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
40c04f5bc4 add href to group title, improve display of several groups 2020-03-12 16:06:36 +01:00
768b053a03 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:03:48 +01:00
1801d1652c Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:53:07 +01:00
7ce0cd92af Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:51:13 +01:00
ac4fc24431 Edit index.html 2020-03-12 15:49:02 +01:00
e31c9cf522 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:46:14 +01:00
2aeff7ef09 Edit index.html 2020-03-12 15:43:12 +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
3fcf8105f7 Merge remote-tracking branch 'origin/performance-tests' into updateGroupsAPI 2020-03-12 14:41:39 +01:00
a30d458219 Created first Api implementation 2020-03-12 14:40:07 +01:00
13e1cf0e36 Merge remote-tracking branch 'origin/performance-tests' into groups-for-user
# Conflicts:
#	src/main/java/mops/gruppen2/service/GroupService.java
2020-03-12 14:39:08 +01:00
f64bb0f578 refactor projection method 2020-03-12 14:37:32 +01:00
7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
8ddf9f2d64 Merge branch 'groups-for-user' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into groups-for-user 2020-03-12 13:56:06 +01:00
a775040abe add 2 new Queries and 2 Methods for UserService 2020-03-12 13:55:10 +01:00