Commit Graph
822 Commits
Author SHA1 Message Date
Mahgs 0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +01:00
Christoph e48c1a78bb update readme 2020-03-13 16:10:16 +01:00
killerber4t e870733b37 Merge remote-tracking branch 'origin/group-details' into group-details 2020-03-13 16:09:25 +01:00
killerber4t a1cc13eb00 change create 2020-03-13 16:08:47 +01:00
kasch309 86622b4a0c add cases for different roles and visibility 2020-03-13 16:07:12 +01:00
AndiBuls 389cda5bc3 made visibility and groupType checkboxes 2020-03-13 15:49:12 +01:00
killerber4t 68fcc06a17 add details page 2020-03-13 15:11:23 +01:00
Max OerterandGitHub eb969521d6 Merge pull request #66 from hhu-propra2/quickSwaggerAndUserRolesImpovement
quick refactor
2020-03-13 14:45:16 +01:00
LukasEttel 8ce3fc39b1 quick refactor 2020-03-13 14:42:17 +01:00
AndiBuls eb43af6bec added buttons for visibility option 2020-03-13 14:33:41 +01:00
kasch309 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
kasch309 7bbdbad28e Add details.html to display group details 2020-03-13 14:27:38 +01:00
Max OerterandGitHub 5fa80753c2 Merge pull request #65 from hhu-propra2/updateGroupsAPI
Update groups api
2020-03-13 13:57:56 +01:00
LukasEttel 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
Talha CaliskanandGitHub 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
LukasEttel d1f296129d Impletended SwaggerApi with all provisionally funktiontionallitys 2020-03-13 13:50:49 +01:00
XXNitram 26f26a1c1a Add JavaDoc comments to SerializationService 2020-03-13 13:47:05 +01:00
XXNitram 6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
Talha CaliskanandGitHub cd60dca352 Merge pull request #63 from hhu-propra2/controller-fix
add new Controller to redirect
2020-03-12 16:58:30 +01:00
killerber4t 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
killerber4t d3ba609e6a fix ControllerTest 2020-03-12 16:54:42 +01:00
Talha CaliskanandGitHub 2b7a9a3802 Merge branch 'master' into controller-fix 2020-03-12 16:49:33 +01:00
killerber4t 430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +01:00
kasch309andGitHub 591966f14c Merge pull request #62 from hhu-propra2/groups-for-user
Groups for user
2020-03-12 16:37:13 +01:00
LukasEttel 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
LukasEttel 4e874bf6e2 Impletended the updategroup(status) method in the API 2020-03-12 16:27:52 +01:00
kasch309 ca360b1596 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:26:31 +01:00
kasch309 c73cf2a870 change color of submit button in search.html and create.html 2020-03-12 16:25:39 +01:00
Talha CaliskanandGitHub c8f24f834d Merge pull request #61 from hhu-propra2/groups-for-user
Groups for user
2020-03-12 16:25:36 +01:00
XXNitram 3608e05ad4 Disable Tests 2020-03-12 16:23:46 +01:00
XXNitram 6f213af10e Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:18:25 +01:00
XXNitram 80a9566d6f Add ControllerService and refactor Gruppen2Controller 2020-03-12 16:18:15 +01:00
LukasEttel 9795c10c14 Impletended the updategroup(status) method in the API 2020-03-12 16:11:32 +01:00
kasch309 40c04f5bc4 add href to group title, improve display of several groups 2020-03-12 16:06:36 +01:00
tomvahl 768b053a03 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:03:48 +01:00
tomvahl 1801d1652c Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:53:07 +01:00
killerber4t 7ce0cd92af Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:51:13 +01:00
kasch309 ac4fc24431 Edit index.html 2020-03-12 15:49:02 +01:00
tomvahl e31c9cf522 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:46:14 +01:00
kasch309 2aeff7ef09 Edit index.html 2020-03-12 15:43:12 +01:00
killerber4t d5b1ac2429 slight change to controller redirect 2020-03-12 15:31:59 +01:00
XXNitram 70d911c576 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent to Gruppen2Controller 2020-03-12 15:22:10 +01:00
killerber4t 9f40df9d59 add Usergroups to controller 2020-03-12 15:14:46 +01:00
tomvahl 77b6ba247d add comments 2020-03-12 15:13:56 +01:00
killerber4t a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
killerber4t 8c0975def3 fix queries 2020-03-12 14:55:32 +01:00
killerber4t 528ca1a2c0 refactor projecteventlist 2020-03-12 14:46:41 +01:00
LukasEttel 3fcf8105f7 Merge remote-tracking branch 'origin/performance-tests' into updateGroupsAPI 2020-03-12 14:41:39 +01:00
LukasEttel a30d458219 Created first Api implementation 2020-03-12 14:40:07 +01:00
killerber4t 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