Commit Graph
250 Commits
Author SHA1 Message Date
kasch309 7bbdbad28e Add details.html to display group details 2020-03-13 14:27:38 +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
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
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
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
Christoph f64bb0f578 refactor projection method 2020-03-12 14:37:32 +01:00
Christoph 31b9456892 update eventbuilder 2020-03-12 14:08:14 +01:00
killerber4t 7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
Christoph 07bbbec7e5 Merge branch 'master' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts. 2020-03-12 13:57:48 +01:00
killerber4t 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
killerber4t a775040abe add 2 new Queries and 2 Methods for UserService 2020-03-12 13:55:10 +01:00
LukasEttel c6c62b07bf created first API implementation 2020-03-12 13:52:50 +01:00
Talha CaliskanandGitHub f8237853a8 Merge pull request #60 from hhu-propra2/refactor-events
Refactor events
2020-03-12 13:23:54 +01:00
XXNitram 0db2ab2714 Fix Architecture tests in ServiceTest 2020-03-12 13:16:44 +01:00
XXNitram 18560c1e35 Fix Architecture tests in LayeredArchitectureTest 2020-03-12 13:15:00 +01:00
XXNitram 9b004bef58 Create new package config and move Gruppen2Config to it 2020-03-12 13:14:22 +01:00
killerber4t f43be951a6 change failing Tests 2020-03-12 13:11:40 +01:00
kasch309 689bc03584 Fix test createSingleGroup 2020-03-11 16:45:38 +01:00
kasch309 5e1b10f77e Ignored EventBuilder.java, because it has to be fixed 2020-03-11 16:44:46 +01:00
killerber4t 05da814f4e change createSingleGroup test 2020-03-11 16:34:28 +01:00
killerber4t 846eee9606 refactor tests for new events 2020-03-11 16:10:58 +01:00
Christoph b7b4485d03 add missing enums 2020-03-11 15:34:52 +01:00
Christoph e8770066f8 change create group event + new group fields 2020-03-11 15:27:56 +01:00
Talha CaliskanandGitHub aaa3437eed Merge pull request #57 from hhu-propra2/GroupLogicProjection
Group logic projection
2020-03-11 14:04:23 +01:00
Mahgs 0e979c1f04 removed deleteGroupTest in GroupTest -> moved to GroupServiceTest 2020-03-11 14:02:23 +01:00
Mahgs d102f9b0ee fixed GroupServiceTest for new Method in GroupService 2020-03-11 13:52:26 +01:00
LukasEttel 31f19f0199 Revert "add functionality for group_ids to User class"
This reverts commit 68789099
2020-03-11 13:47:41 +01:00