|
|
0c8e841c8e
|
new api tests + fixes
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 17:24:25 +02:00 |
|
|
|
58f0cfbe33
|
new individual event-tests + removed old comments + removed doubled exception
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 15:47:25 +02:00 |
|
|
|
36ebb6b8b6
|
rename package
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 14:12:43 +02:00 |
|
|
|
eee7b4367a
|
two mapping renames
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 13:18:54 +02:00 |
|
|
|
100f5649c0
|
invite mappings to search controller + slight invite changes
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:45:32 +01:00 |
|
|
|
4cd0808fdc
|
split main controller into multiple
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:32:32 +01:00 |
|
|
|
40e86d6d55
|
use static method
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:17:40 +01:00 |
|
|
|
98607dcf49
|
remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:15:22 +01:00 |
|
|
|
5ee92d5cd6
|
fix
|
2020-03-27 16:40:30 +01:00 |
|
|
|
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 |
|
|
|
9a0035ba1a
|
added javaDoc Comments to ControllerService
|
2020-03-27 15:58:39 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8c29d04740
|
fix schema
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:15:05 +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 |
|
|
|
cc64943663
|
only show link to admin
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:35:52 +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 |
|
|
|
a1e67eac9c
|
Merge remote-tracking branch 'origin/master' into serchAll
|
2020-03-26 16:38:14 +01:00 |
|
|
|
dbe3cc7f51
|
added show all to search.html
|
2020-03-26 16:37:28 +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 |
|
