christoph/lecture-professional-software-development
1
Fork 0
Code Activity
762 Commits 2 Branches 0 Tags
5da796d66d38e760c7eabea92c3809aa161427fc
Commit Graph

598 Commits

Author SHA1 Message Date
XXNitram
051196f766 Add CSV methods and createLecture.html 
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-18 13:36:57 +01:00
XXNitram
af573f2353 Add list entry in html 
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-18 13:36:22 +01:00
killerber4t
5f1cdca4ee fix text overflow in groupdescription 2020-03-18 13:21:44 +01:00
[Mahgs]
b431361eec merged with master 2020-03-18 13:19:19 +01:00
[Mahgs]
722cd80831 Merge remote-tracking branch 'origin/master' into group-invite-links 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-18 13:18:34 +01:00
killerber4t
a6667e4091 fix text overflow in groupdescription 2020-03-18 13:08:35 +01:00
killerber4t
0828c278dc fix visibility recognition in detailsMember.html 2020-03-18 12:47:03 +01:00
killerber4t
b8936052cb fix role recognition in detailsMember.html 2020-03-18 12:43:49 +01:00
XXNitram
4b1627a993 Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/APIController.java
#	src/main/resources/templates/create.html
 2020-03-18 03:23:22 +01:00
XXNitram
179062eed9 Add createLecture for orga only 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-17 17:07:30 +01:00
killerber4t
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
killerber4t
9491f83cca fix roles on detailsMember.html 2020-03-17 16:57:13 +01:00
kasch309
06eb174c42 add table column 2020-03-17 16:56:38 +01:00
Christoph
aa67bd2e88 Add missing service 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 16:55:32 +01:00
killerber4t
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
killerber4t
47ee171070 fix roles on detailsMember.html 2020-03-17 16:42:31 +01:00
kasch309
e9199857b7 change table class 2020-03-17 16:35:00 +01:00
kasch309
b0186eee66 fix edit members button (add margin) 2020-03-17 16:32:04 +01:00
kasch309
b648920c42 fix template 2020-03-17 16:29:55 +01:00
Christoph
6e067d1b47 Fix InviteLink DB Schema + Implement Frontend InviteLink Handling 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 16:16:58 +01:00
killerber4t
3036f76b37 Merge remote-tracking branch 'origin/master' into edit-User 2020-03-17 16:16:44 +01:00
Lukas Ettel
49c38b583c Quick fix on master 2020-03-17 16:13:29 +01:00
kasch309
d2f71e6390 delete table column 2020-03-17 16:11:24 +01:00
Talha Caliskan
90a07e7b2a Merge pull request #90 from hhu-propra2/eventExeptionHandling 
Implementation of old EventExeptions
 2020-03-17 16:06:54 +01:00
killerber4t
72ae173307 Merge remote-tracking branch 'origin/ui-edit-user' into edit-User 2020-03-17 16:02:26 +01:00
killerber4t
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
Lukas Ettel
991bcf2aaa Implementation of old EventExeptions 2020-03-17 15:57:26 +01:00
kasch309
9b6a168fb6 Add rough template for editing embers of a group 2020-03-17 15:55:51 +01:00
killerber4t
a868ea86b4 add edit-members to controller 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 15:31:53 +01:00
tomvahl
bd9e1bb28e add Join Group 
Mitgearbeitet hat:
Karla
Andi
 2020-03-17 15:11:40 +01:00
killerber4t
c052ec6ae6 refactor code 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 14:58:02 +01:00
killerber4t
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
killerber4t
aa843f1d8e fix html 2020-03-17 14:46:20 +01:00
Talha Caliskan
ea0810174a Merge branch 'master' into delete-User 2020-03-17 14:39:02 +01:00
killerber4t
61e007e4d8 add leaving group 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 14:36:55 +01:00
AndiBuls
4bcf931246 spacing still wrong 2020-03-17 13:58:34 +01:00
AndiBuls
41833b2a07 fixed spacing for details 2020-03-17 13:56:03 +01:00
AndiBuls
1acfcc449f Merge pull request #85 from hhu-propra2/ui-improvements 
fix styling, add missing attributes
 2020-03-17 13:50:02 +01:00
XXNitram
bddffd48c1 Merge pull request #84 from hhu-propra2/change-to-polymorphie 
Change to polymorphie
 2020-03-17 13:49:39 +01:00
kasch309
bae8805972 fix styling, add missing attributes 2020-03-17 13:47:09 +01:00
Lukas Ettel
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
[Mahgs]
906585ce9a added InviteLinkRepository 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 13:42:35 +01:00
Christoph
e045dc54ee Add InviteLinkDTO + add dto folder 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 13:33:02 +01:00
Christoph
db11178ccd Add db table for invite links 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 13:25:37 +01:00
AndiBuls
e2dcee44af added deleted button in search.html and changed design of index.html 2020-03-17 13:15:21 +01:00
Lukas Ettel
325c5d84f9 Merge branch 'master' into change-to-polymorphie 2020-03-17 13:05:20 +01:00
tomvahl
cbf69e387b fix search funktion 2020-03-17 12:35:06 +01:00
tomvahl
8387b58e35 change createGroup Methode in ControllerService 2020-03-17 11:09:27 +01:00
tomvahl
1b8fa04826 change createGroup Methode in ControllerService 2020-03-17 10:45:03 +01:00
Lukas Ettel
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