Commit Graph
665 Commits
Author SHA1 Message Date
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
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
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
Mahgs 0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +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
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
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
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
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
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
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