|
|
9a0035ba1a
|
added javaDoc Comments to ControllerService
|
2020-03-27 15:58:39 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
215a10c8fc
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 12:56:23 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
41e035d901
|
a
|
2020-03-26 15:38:39 +01:00 |
|
|
|
25595c9380
|
merged with master
|
2020-03-26 15:11:12 +01:00 |
|
|
|
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 |
|
|
|
bbf4f0b6e5
|
changed Titel in error.html
|
2020-03-26 15:03:30 +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 |
|
|
|
4d0968b2d9
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-26 14:25:01 +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 |
|
|
|
de0e8ee4fe
|
fixed some problems in WebController
|
2020-03-26 13:48:17 +01:00 |
|
|
|
2c6c844edd
|
delete InviteLinkDTO
|
2020-03-26 13:38:11 +01:00 |
|
|
|
eb59a70dd4
|
added javaDoc for UserService
|
2020-03-26 13:32:48 +01:00 |
|
|
|
3c05dbef75
|
added javaDoc for EventService and fix Todo
fix Todo in EventRepository
|
2020-03-26 13:28:23 +01:00 |
|
|
|
ae468f4afc
|
added javaDoc for GroupService
|
2020-03-26 13:14:35 +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 |
|
