christoph/lecture-professional-software-development
1
Fork 0
Code Activity
505 Commits 2 Branches 0 Tags
ec88a6bcad37a9e41573a221cab5c841bb5b375b
Commit Graph

505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XXNitram
6929b1ead4 Add Service Annotation 2020-03-18 14:43:26 +01:00
XXNitram
f408391f4c Refactor Gruppen2Controller 2020-03-18 14:40:39 +01:00
XXNitram
ba4a531337 Merge remote-tracking branch 'origin/master' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
 2020-03-18 14:38:50 +01:00
XXNitram
f292700c78 Merge remote-tracking branch 'origin/master' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-18 14:27:54 +01:00
Christoph
9541188350 Merge pull request #95 from hhu-propra2/updateCheckGroup 
Update check group
 2020-03-18 14:25:36 +01:00
Christoph
9934249cb5 Merge pull request #94 from hhu-propra2/defaultRoute 
Default route
 2020-03-18 14:24:48 +01:00
kasch309
3b09d2a3a2 Merge remote-tracking branch 'origin/edit-User' into edit-User 
# Conflicts:
#	src/main/resources/templates/editMembers.html
 2020-03-18 14:23:27 +01:00
[Mahgs]
69141705ab fixed tests 2020-03-18 14:22:23 +01:00
kasch309
b89b47ec81 set redirection to index instead of previous page 2020-03-18 14:21:39 +01:00
kasch309
75a4701bd0 fix table and functionality 2020-03-18 14:21:05 +01:00
killerber4t
45679c7d2a Update .gitignore 2020-03-18 14:20:32 +01:00
XXNitram
838bff1d9f Update GroupType in createGroup 
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 14:19:00 +01:00
XXNitram
0db03f2ab5 Add createLecture feature 
also add private checkbox again and delete the uploadCsv methods in APIController

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 14:13:58 +01:00
killerber4t
56f82203cd fix entering group youre already part of 2020-03-18 14:11:52 +01:00
[Mahgs]
b236e3bb9d changed checkGroup Method to a Query 2020-03-18 14:09:30 +01:00
[Mahgs]
523d7d2ad9 added a default route 2020-03-18 13:52:48 +01:00
[Mahgs]
e2326d5f23 added a default route 2020-03-18 13:46:51 +01:00
killerber4t
19e8ef9c07 remove unnecessary line 2020-03-18 13:43:12 +01:00
killerber4t
5703ad4678 fix random error 2020-03-18 13:40:07 +01:00
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
XXNitram
eabbcc7e04 Add jackson dependency 
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:35:41 +01:00
killerber4t
5f1cdca4ee fix text overflow in groupdescription 2020-03-18 13:21:44 +01:00
Max Oerter
e9ee776047 Merge pull request #93 from hhu-propra2/group-invite-links 
added Group invite links
 2020-03-18 13:21:34 +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
Talha Caliskan
e412c051f7 Merge pull request #91 from hhu-propra2/quickFix 
Quick fix on master
 2020-03-17 16:15:26 +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