christoph/lecture-professional-software-development
1
Fork 0
Code Activity
731 Commits 2 Branches 0 Tags
95da5e6cd896eb5ee357428036e973ee460a6a1c
Commit Graph

52 Commits

Author SHA1 Message Date
[Mahgs]
5ee92d5cd6 fix 2020-03-27 16:40:30 +01:00
[Mahgs]
f3f5f072b9 Merge remote-tracking branch 'origin/master' into JavaDocComments 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
 2020-03-27 16:39:40 +01:00
XXNitram
59e9ff4d4d Merge with master 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-27 15:55:23 +01:00
XXNitram
bf122457c2 Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ValidationService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java
 2020-03-27 15:33:45 +01:00
[Mahgs]
3650561123 Merge remote-tracking branch 'origin/master' into JavaDocComments 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-27 15:29:50 +01:00
XXNitram
2e3f705544 Fix merge confilcts 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-27 15:26:32 +01:00
XXNitram
aa5481afdb Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java
 2020-03-27 15:18:32 +01:00
Christoph
8a24aee6de fix 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 15:04:52 +01:00
XXNitram
289299f6e8 Further further further refactor 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-27 15:02:33 +01:00
[Mahgs]
d0114a5a58 Merge remote-tracking branch 'origin/master' into JavaDocComments 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/EventService.java
#	src/main/java/mops/gruppen2/service/UserService.java
 2020-03-27 14:56:41 +01:00
Christoph
63d9b76d40 caching 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 14:33:01 +01:00
Christoph
9ccb7c77a2 fix invite 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 14:04:32 +01:00
Christoph
ef00c42f6f fix invite 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 13:45:11 +01:00
Christoph
56a81ce66f caching 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 12:57:47 +01:00
Christoph
02e7bcbcc4 fix api 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 21:19:59 +01:00
Christoph
b37f2349aa secure invite link 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 20:53:59 +01:00
Christoph
5e5939aa42 Merge branch 'csrf' into invite-link-update 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/schema.sql
 2020-03-26 18:28:34 +01:00
[Mahgs]
bacf9be7cc added link to controller 2020-03-26 17:14:49 +01:00
Lukas Ettel
3fc4d82dbe Futher further refactor 
Co-authored-by: AndiBuls <49692239+andibuls@users.noreply.github.com>
Co-authored-by: XXNitram <17749825+xxnitram@users.noreply.github.com>
 2020-03-26 16:57:46 +01:00
Lukas Ettel
d58cde597b Futher refactor 
Co-authored-by: AndiBuls <49692239+andibuls@users.noreply.github.com>
Co-authored-by: XXNitram <17749825+xxnitram@users.noreply.github.com>
 2020-03-26 16:31:17 +01:00
[Mahgs]
41e035d901 a 2020-03-26 15:38:39 +01:00
Lukas Ettel
b5d688311d Refactor of all addFromCsv in Deteils complete 
Co-authored-by: AndiBuls<andreas.buls@uni-duesseldorf.de>
 2020-03-26 15:23:52 +01:00
[Mahgs]
25595c9380 merged with master 2020-03-26 15:11:12 +01:00
[Mahgs]
c62524aa8a Merge remote-tracking branch 'origin/master' into JavaDocComments 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-26 15:06:44 +01:00
[Mahgs]
bbf4f0b6e5 changed Titel in error.html 2020-03-26 15:03:30 +01:00
Lukas Ettel
7f1aab017e Merge remote-tracking branch 'origin/master' into refactor-controllerService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-26 14:45:43 +01:00
[Mahgs]
4d0968b2d9 Merge remote-tracking branch 'origin/master' into JavaDocComments 2020-03-26 14:25:01 +01:00
XXNitram
677ed4e37b Add validation for setting a new userMaximum 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-26 14:14:45 +01:00
Lukas Ettel
91e745e939 Merge remote-tracking branch 'origin/master' into refactor-controllerService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-26 13:57:10 +01:00
Lukas Ettel
8c1eb876c5 Refactor of all createGroups complete 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-26 13:50:22 +01:00
[Mahgs]
de0e8ee4fe fixed some problems in WebController 2020-03-26 13:48:17 +01:00
killerber4t
923dd713df Merge remote-tracking branch 'origin/master' into refactor-ValidationService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-26 13:04:17 +01:00
AndiBuls
d1c8865580 html fix title alignment in detailsMember.html 
Co-authored-by:
LukasEttel <lukas.ettie@yahoo.de>
tomvahl <tom-vahl@hotmail.com>
XXNitram <matti.55@hotmail.de>
[Mahgs] <maxoerter@gmx.de>
Christoph <tobi@urpost.de>
killerber4t <t.caliskan@live.de>
kasch309 <fr3sh3rpi55a@gmail.com>
 2020-03-25 17:05:06 +01:00
killerber4t
57df0263d4 refactor ValidationService 2020-03-25 16:52:43 +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
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