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

367 Commits

Author SHA1 Message Date
killerber4t
e2b40e5aec refactor tests after merging master 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
 2020-03-27 15:13:38 +01:00
killerber4t
55fa269edb Merge remote-tracking branch 'origin/master' into ControllerServiceTests 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java
#	src/test/java/mops/gruppen2/service/GroupServiceTest.java
 2020-03-27 14:48:54 +01:00
killerber4t
244f3fa675 fix checkstyle errors 2020-03-27 14:46:09 +01:00
[Mahgs]
64dd8f5ad3 Merge remote-tracking branch 'origin/invite-link-update' into invite-link-update 2020-03-27 14:38:17 +01:00
[Mahgs]
9c984f8572 fixed checkstyle in tests 2020-03-27 14:38:07 +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
858efd57d3 fixfixfix 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-27 13:17:09 +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
Christoph
853a5bcb03 fix forms to automatically generate csrf tokens 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 18:21:52 +01:00
[Mahgs]
bacf9be7cc added link to controller 2020-03-26 17:14:49 +01:00
Christoph
68a9ddeecc create links 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 17:10:15 +01:00
Christoph
9302bc68b5 queries + inviteservice 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 17:04:12 +01:00
Christoph
f581169afc queries 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 16:45:54 +01:00
Christoph
d336c10802 schema fix + repo + dto 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 16:41:18 +01:00
Talha Caliskan
72eaed4279 Merge pull request #146 from hhu-propra2/docker-profile-security 
Docker profile security
 2020-03-26 16:33:19 +01:00
Christoph
33e3d9d3f5 docker profiles, docker compose, mysql entrypoint, security 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-26 16:06:40 +01:00
killerber4t
2443179ad5 add Multiple tests And rename 1 Method 2020-03-26 16:00:16 +01:00
Lukas Ettel
5394b5d47a Refactor of all createGroups complete 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-26 14:52:11 +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
Lukas Ettel
c88990a3ed Refactor of all createGroups complete 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-26 14:42:32 +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
XXNitram
1cc52d7dce Fix checkFields 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-26 14:14:06 +01:00
XXNitram
4f833c3c5f Refactor WrongFileException 2020-03-26 14:12:53 +01:00
Lukas Ettel
7b9af1320c Refactor of all createGroups complete 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-26 14:06:13 +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
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
b7bf21f4c3 Merge remote-tracking branch 'origin/refactor-controllerService' into refactor-ValidationService 2020-03-25 16:57:38 +01:00
killerber4t
57df0263d4 refactor ValidationService 2020-03-25 16:52:43 +01:00
AndiBuls
a140cd22a0 Merge branch 'master' into refactor-controllerService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-25 16:45:01 +01:00
[Mahgs]
81b93266e5 fixed checkstyle problems 2020-03-25 16:36:37 +01:00
AndiBuls
95e3c38dd9 refactor createOrga 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
 2020-03-25 16:30:22 +01:00
Christoph
9045cace9c Merge pull request #138 from hhu-propra2/add-ValidationService 
Add validation service
 2020-03-25 16:12:05 +01:00
Christoph
f09b498369 Merge remote-tracking branch 'origin/master' into group-list-ordering 
# Conflicts:
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-25 16:09:46 +01:00
Talha Caliskan
c00ee2f235 Merge branch 'master' into add-ValidationService 2020-03-25 16:09:20 +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
Christoph
f0e49dfc55 slight changes 
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 15:57:07 +01:00
tomvahl
6f9ab00ba1 fix UUID 2020-03-25 15:56:30 +01:00
tomvahl
48b8617cbb Merge branch 'master' into killertester 2020-03-25 15:52:53 +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
Christoph
ed4a9b5728 add badges in group lists 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-25 15:46:58 +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
5736de146d refactor createGroup and createOrga 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
                tomvahl <tom-vahl@hotmail.com>
 2020-03-25 15:38:37 +01:00
AndiBuls
dd7404553c Merge pull request #135 from hhu-propra2/fix_createGroup 
Fix create group
 2020-03-25 14:50:41 +01:00