1
Commit Graph

288 Commits

Author SHA1 Message Date
56f82203cd fix entering group youre already part of 2020-03-18 14:11:52 +01:00
19e8ef9c07 remove unnecessary line 2020-03-18 13:43:12 +01:00
5703ad4678 fix random error 2020-03-18 13:40:07 +01:00
5f1cdca4ee fix text overflow in groupdescription 2020-03-18 13:21:44 +01:00
a6667e4091 fix text overflow in groupdescription 2020-03-18 13:08:35 +01:00
0828c278dc fix visibility recognition in detailsMember.html 2020-03-18 12:47:03 +01:00
b8936052cb fix role recognition in detailsMember.html 2020-03-18 12:43:49 +01:00
61dc1eb928 Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User 2020-03-17 16:57:25 +01:00
9491f83cca fix roles on detailsMember.html 2020-03-17 16:57:13 +01:00
06eb174c42 add table column 2020-03-17 16:56:38 +01:00
a67d8fa993 Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User 2020-03-17 16:44:09 +01:00
47ee171070 fix roles on detailsMember.html 2020-03-17 16:42:31 +01:00
e9199857b7 change table class 2020-03-17 16:35:00 +01:00
b0186eee66 fix edit members button (add margin) 2020-03-17 16:32:04 +01:00
b648920c42 fix template 2020-03-17 16:29:55 +01:00
3036f76b37 Merge remote-tracking branch 'origin/master' into edit-User 2020-03-17 16:16:44 +01:00
49c38b583c Quick fix on master 2020-03-17 16:13:29 +01:00
d2f71e6390 delete table column 2020-03-17 16:11:24 +01:00
90a07e7b2a Merge pull request #90 from hhu-propra2/eventExeptionHandling
Implementation of old EventExeptions
2020-03-17 16:06:54 +01:00
72ae173307 Merge remote-tracking branch 'origin/ui-edit-user' into edit-User 2020-03-17 16:02:26 +01:00
ca80b7ca2b add changeRole and refactor Event-Methods in ControllerService
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
2020-03-17 16:00:04 +01:00
991bcf2aaa Implementation of old EventExeptions 2020-03-17 15:57:26 +01:00
9b6a168fb6 Add rough template for editing embers of a group 2020-03-17 15:55:51 +01:00
a868ea86b4 add edit-members to controller
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 15:31:53 +01:00
bd9e1bb28e add Join Group
Mitgearbeitet hat:
Karla
Andi
2020-03-17 15:11:40 +01:00
c052ec6ae6 refactor code
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:58:02 +01:00
2738b6a35f Merge branch 'delete-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into delete-User 2020-03-17 14:47:02 +01:00
aa843f1d8e fix html 2020-03-17 14:46:20 +01:00
ea0810174a Merge branch 'master' into delete-User 2020-03-17 14:39:02 +01:00
61e007e4d8 add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:36:55 +01:00
4bcf931246 spacing still wrong 2020-03-17 13:58:34 +01:00
41833b2a07 fixed spacing for details 2020-03-17 13:56:03 +01:00
1acfcc449f Merge pull request #85 from hhu-propra2/ui-improvements
fix styling, add missing attributes
2020-03-17 13:50:02 +01:00
bddffd48c1 Merge pull request #84 from hhu-propra2/change-to-polymorphie
Change to polymorphie
2020-03-17 13:49:39 +01:00
bae8805972 fix styling, add missing attributes 2020-03-17 13:47:09 +01:00
0467d3c6a6 removed outdated test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 13:46:19 +01:00
e2dcee44af added deleted button in search.html and changed design of index.html 2020-03-17 13:15:21 +01:00
325c5d84f9 Merge branch 'master' into change-to-polymorphie 2020-03-17 13:05:20 +01:00
cbf69e387b fix search funktion 2020-03-17 12:35:06 +01:00
8387b58e35 change createGroup Methode in ControllerService 2020-03-17 11:09:27 +01:00
1b8fa04826 change createGroup Methode in ControllerService 2020-03-17 10:45:03 +01:00
ca469d83af even further stuff
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
2020-03-16 17:01:44 +01:00
6991a18405 fix UpdateRoleEvent and DeleteUserEvent
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
2020-03-16 16:50:32 +01:00
abd99f6a5e further refactor of eventhandling
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
2020-03-16 16:33:26 +01:00
6c8a5fbe78 changed docker.properties
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-16 16:25:04 +01:00
d0a42c4569 Merge remote-tracking branch 'origin/master' into keycloakRestApi 2020-03-16 16:18:25 +01:00
7e2c1dec81 tested APIController
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-16 16:16:46 +01:00
ee6d2cca9f Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie 2020-03-16 15:53:34 +01:00
4f6ec4ed96 Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie 2020-03-16 15:53:03 +01:00
266c1d6da9 Merge remote-tracking branch 'origin/change-to-polymorphie' into change-to-polymorphie 2020-03-16 15:48:16 +01:00