901 Commits
Author SHA1 Message Date
kasch309andGitHub f4ad729efd Merge pull request #76 from hhu-propra2/fix-vis-in-db
partially fix vis in db
2020-03-16 13:04:05 +01:00
killerber4t e2978e10d0 fix visibility in controller 2020-03-16 12:37:45 +01:00
ChristophandGitHub 9e1a04f723 Merge pull request #75 from hhu-propra2/docker-profile
add docker spring profile, mysql adapter + docker compose
2020-03-16 12:36:03 +01:00
Christoph f6a3b431a9 add docker spring profile, mysql adapter + docker compose 2020-03-15 15:19:02 +01:00
killerber4t 051b3c3724 Merge branch 'UI-Improvements' 2020-03-14 23:49:30 +01:00
killerber4t 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
Talha CaliskanandGitHub 916a386179 Merge pull request #73 from hhu-propra2/fix-search
fix problem where search was keeping same search throughout session a…
2020-03-14 23:35:38 +01:00
killerber4t 264d4ad052 fix problem where search was keeping same search throughout session and some UI changes 2020-03-14 23:29:49 +01:00
killerber4t 43a3282b67 added functionality to choose wether group is private or open 2020-03-14 22:54:40 +01:00
killerber4t d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +01:00
Talha CaliskanandGitHub 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
Talha CaliskanandGitHub d939631eac Update EventRepository.java 2020-03-14 09:31:48 +01:00
Talha CaliskanandGitHub 403b32ed76 Update EventRepository.java 2020-03-14 09:30:49 +01:00
Talha CaliskanandGitHub 434a69f93d Merge branch 'master' into change_DTO 2020-03-14 09:28:39 +01:00
tomvahl fa79b3f136 change EventDTO, add AddUserEventController, add the search function in UI and backend 2020-03-14 09:17:32 +01:00
killerber4t 3d7681fc8f add more UI improvements and functionality 2020-03-14 02:03:08 +01:00
killerber4t 3849b61614 add some UI-improvements and functionality 2020-03-14 01:11:56 +01:00
Talha CaliskanandGitHub c4f90e0baf Merge pull request #70 from hhu-propra2/group-create
Group create
2020-03-13 23:07:36 +01:00
AndiBulsandGitHub 94317af298 Merge branch 'master' into group-create 2020-03-13 16:59:00 +01:00
AndiBuls 599208cc79 created dropdown for Veranstaltung 2020-03-13 16:51:10 +01:00
kasch309andGitHub 778ec3d1aa Merge pull request #68 from hhu-propra2/group-details
Group details
2020-03-13 16:50:47 +01:00
Max OerterandGitHub b09feabc09 Merge pull request #69 from hhu-propra2/fixingLogoutButton
Fixed the Logout Button
2020-03-13 16:43:53 +01:00
kasch309andGitHub a34c119113 Update UpdateRoleEvent.java 2020-03-13 16:41:27 +01:00
LukasEttel 316352c3b9 Fixed the Logout Button 2020-03-13 16:38:32 +01:00
kasch309andGitHub e5b69c0cc0 Merge branch 'master' into group-details 2020-03-13 16:36:13 +01:00
kasch309 bfa008f9ef Add file to display group details for non-members 2020-03-13 16:31:50 +01:00
kasch309 ad372c374a Add page titles 2020-03-13 16:31:15 +01:00
killerber4t 46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
Lukas EttelandGitHub a8adbbb31c Merge pull request #67 from hhu-propra2/readme
update readme
2020-03-13 16:18:16 +01:00
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