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

173 Commits

Author SHA1 Message Date
[Mahgs]
de0e8ee4fe fixed some problems in WebController 2020-03-26 13:48:17 +01:00
[Mahgs]
81b93266e5 fixed checkstyle problems 2020-03-25 16:36:37 +01:00
XXNitram
dbfa260c4d Refactor after merge with master 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-25 16:07:31 +01:00
XXNitram
2c70deeb7b Merge remote-tracking branch 'origin/master' into add-ValidationService 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-25 15:51:10 +01:00
XXNitram
0c43050166 Refactor WebController and ValidationService 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-25 15:43:41 +01:00
AndiBuls
dd7404553c Merge pull request #135 from hhu-propra2/fix_createGroup 
Fix create group
 2020-03-25 14:50:41 +01:00
Christoph
74038428df Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users 
Fix group search number of users
 2020-03-25 14:48:26 +01:00
Christoph
22ae8a81dc partial fix search: max user anzahl display 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
 2020-03-25 14:46:02 +01:00
tomvahl
be37fcbd50 add Exceptions 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-25 14:40:59 +01:00
killerber4t
1dd3f9b6fe create ValidationService 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-25 14:08:00 +01:00
Lukas Ettel
062a0505be Deleted the html 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
 2020-03-25 14:03:12 +01:00
XXNitram
8e914d8011 Refactoring 2020-03-25 13:36:47 +01:00
XXNitram
f4935b9a33 Merge remote-tracking branch 'origin/master' into fix-group-search-number-of-users 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/resources/templates/detailsMember.html
#	src/main/resources/templates/search.html
 2020-03-25 13:32:47 +01:00
Christoph
551534d4ff Merge branch 'master' into refactor-controller 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
 2020-03-25 13:03:22 +01:00
XXNitram
7b47a78e99 Fix handing over of parent 2020-03-24 17:57:23 +01:00
XXNitram
9954f685f5 Fix Group Search 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-24 16:59:45 +01:00
[Mahgs]
79619a9476 added pageNotFoundException on not existing routs 2020-03-24 16:46:23 +01:00
[Mahgs]
2d3e935d64 merged with master and fixed some problems 2020-03-24 16:31:55 +01:00
killerber4t
f0a1a9c7bb refactor Controller 2020-03-24 16:16:18 +01:00
killerber4t
d957326491 refactor Controller 2020-03-24 16:02:16 +01:00
killerber4t
f907c617a8 refactor WebController 2020-03-24 15:57:31 +01:00
killerber4t
46aaf3658e refactor createOrga Method in ControllerService 2020-03-24 15:36:52 +01:00
[Mahgs]
6cd41d5e29 Merge remote-tracking branch 'origin/master' into showInviteLink 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/controller/MopsController.java
#	src/main/java/mops/gruppen2/repository/InviteLinkRepository.java
#	src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java
 2020-03-24 15:32:56 +01:00
[Mahgs]
4b6257c9f0 set exceptions on join group 
added emoji to error.html <- wichtig

                                                          Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-24 15:24:24 +01:00
killerber4t
1146308752 rename file 2020-03-24 15:21:55 +01:00
XXNitram
c5de7fa46e Fix parameters 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 15:12:39 +01:00
XXNitram
18ab147703 Merge remote-tracking branch 'origin/master' into feature-change-title-description 2020-03-24 15:09:50 +01:00
[Mahgs]
89354eec26 link now correct displayed 2020-03-24 15:09:44 +01:00
[Mahgs]
60837d8cf3 Merge remote-tracking branch 'origin/master' into showInviteLink 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-24 14:51:33 +01:00
Christoph
5c6d94753b some uuid improvements 2020-03-24 14:37:23 +01:00
XXNitram
59bea22d8e Add changeMetadata feature 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 14:34:52 +01:00
Christoph
2f8a044c53 Merge branch 'master' into invite-link-group-id-change 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-24 14:28:30 +01:00
Christoph
c844f5d4fa some uuid improvements 2020-03-24 14:12:32 +01:00
Christoph
2eca5e1849 fix api etc 2020-03-23 17:01:01 +01:00
Lukas Ettel
14d657131a Merge remote-tracking branch 'origin/showInviteLink' into showInviteLink 
# Conflicts:
#	src/main/resources/templates/detailsMember.html
 2020-03-23 16:54:20 +01:00
Lukas Ettel
6fc0cafc61 link is now displayed correctly but still issus with localhost and keykloak 
Co-authored-by: Max Oerter <33197299+mahgs@users.noreply.github.com>
 2020-03-23 16:53:32 +01:00
Christoph
d562df8826 temporarily disable tests + rough change from groupid to uuid + remove invitelink old system 2020-03-23 16:17:17 +01:00
tomvahl
9023fb72a7 fix nullpointer 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 15:56:15 +01:00
tomvahl
62efdb784d Merge pull request #120 from hhu-propra2/fix-add-csv 
Fix add csv
 2020-03-23 15:38:35 +01:00
[Mahgs]
a03d3f5b69 link displayed in UI 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
 2020-03-23 15:08:39 +01:00
tomvahl
7bae5e1184 add change_maximum size 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 14:57:33 +01:00
[Mahgs]
2a6cf0e529 added create link to createOrga 2020-03-23 13:27:11 +01:00
[Mahgs]
9b1ad8b3da Merge remote-tracking branch 'origin/master' into showInviteLink 2020-03-23 13:16:43 +01:00
Lukas Ettel
06bd77b9e6 merge 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 13:14:22 +01:00
Lukas Ettel
676245d44d Merge remote-tracking branch 'origin/master' into fixSomeErrors 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
 2020-03-23 13:05:32 +01:00
[Mahgs]
6c4a598816 link supplied to getMapping in details.html 2020-03-20 16:47:17 +01:00
killerber4t
069885a771 add adjusting UserMax 2020-03-20 16:38:39 +01:00
Lukas Ettel
a13bdbf6b5 Fixed unauthoriced acsess to group-details 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-20 16:33:56 +01:00
tomvahl
ef946c9f82 automatic group size for ogra 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 15:57:16 +01:00
tomvahl
b6c013e254 fix GroupDelete 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 15:09:27 +01:00