|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
87fbd1b142
|
Merge pull request #150 from hhu-propra2/ControllerServiceTests
Controller service tests
|
2020-03-27 15:15:36 +01:00 |
|
|
|
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 |
|
|
|
8a24aee6de
|
fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 15:04:52 +01:00 |
|
|
|
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 |
|
|
|
3f192c9b81
|
fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:53:31 +01:00 |
|
|
|
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 |
|
|
|
244f3fa675
|
fix checkstyle errors
|
2020-03-27 14:46:09 +01:00 |
|
|
|
64dd8f5ad3
|
Merge remote-tracking branch 'origin/invite-link-update' into invite-link-update
|
2020-03-27 14:38:17 +01:00 |
|
|
|
9c984f8572
|
fixed checkstyle in tests
|
2020-03-27 14:38:07 +01:00 |
|
|
|
63d9b76d40
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:33:01 +01:00 |
|
|
|
9ccb7c77a2
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:04:32 +01:00 |
|
|
|
ef00c42f6f
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:45:11 +01:00 |
|
|
|
858efd57d3
|
fixfixfix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:17:09 +01:00 |
|
|
|
56a81ce66f
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 12:57:47 +01:00 |
|
|
|
02e7bcbcc4
|
fix api
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:19:59 +01:00 |
|
|
|
b37f2349aa
|
secure invite link
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 20:53:59 +01:00 |
|
|
|
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 |
|
|
|
853a5bcb03
|
fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 18:21:52 +01:00 |
|
|
|
bacf9be7cc
|
added link to controller
|
2020-03-26 17:14:49 +01:00 |
|
|
|
68a9ddeecc
|
create links
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:10:15 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f581169afc
|
queries
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:45:54 +01:00 |
|
|
|
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 |
|
|
|
72eaed4279
|
Merge pull request #146 from hhu-propra2/docker-profile-security
Docker profile security
|
2020-03-26 16:33:19 +01:00 |
|
|
|
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 |
|
|
|
33e3d9d3f5
|
docker profiles, docker compose, mysql entrypoint, security
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:06:40 +01:00 |
|
|
|
2443179ad5
|
add Multiple tests And rename 1 Method
|
2020-03-26 16:00:16 +01:00 |
|
|
|
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 |
|
|
|
5394b5d47a
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:52:11 +01:00 |
|
|
|
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 |
|
|
|
c88990a3ed
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:42:32 +01:00 |
|
|
|
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 |
|
|
|
1cc52d7dce
|
Fix checkFields
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-26 14:14:06 +01:00 |
|
|
|
4f833c3c5f
|
Refactor WrongFileException
|
2020-03-26 14:12:53 +01:00 |
|
|
|
7b9af1320c
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:06:13 +01:00 |
|
|
|
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 |
|
|
|
8c1eb876c5
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 13:50:22 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b7bf21f4c3
|
Merge remote-tracking branch 'origin/refactor-controllerService' into refactor-ValidationService
|
2020-03-25 16:57:38 +01:00 |
|
|
|
57df0263d4
|
refactor ValidationService
|
2020-03-25 16:52:43 +01:00 |
|
|
|
a140cd22a0
|
Merge branch 'master' into refactor-controllerService
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-25 16:45:01 +01:00 |
|
|
|
81b93266e5
|
fixed checkstyle problems
|
2020-03-25 16:36:37 +01:00 |
|
|
|
95e3c38dd9
|
refactor createOrga
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
|
2020-03-25 16:30:22 +01:00 |
|
|
|
9045cace9c
|
Merge pull request #138 from hhu-propra2/add-ValidationService
Add validation service
|
2020-03-25 16:12:05 +01:00 |
|
|
|
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 |
|
