|
|
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 |
|
|
|
c5d48a561b
|
include new dev-branch in actions
|
2020-03-28 19:41:02 +01:00 |
|
|
|
eb11751663
|
Merge pull request #156 from hhu-propra2/JavaDocComments
Java doc comments
|
2020-03-27 16:45:42 +01:00 |
|
|
|
f2c2a11470
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 16:40:53 +01:00 |
|
|
|
5ee92d5cd6
|
fix
|
2020-03-27 16:40:30 +01:00 |
|
|
|
890abe73d0
|
Merge pull request #155 from hhu-propra2/add-arc
Add arc
|
2020-03-27 16:39:59 +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 |
|
|
|
4c064ae307
|
delete wrong file
|
2020-03-27 16:37:55 +01:00 |
|
|
|
0963970eac
|
add arc42 full file
|
2020-03-27 16:36:04 +01:00 |
|
|
|
77c11bfec0
|
Merge pull request #154 from hhu-propra2/controllerAndControllerServiceRefactor
Controller and controller service refactor
|
2020-03-27 16:34:46 +01:00 |
|
|
|
b79326f6d8
|
Merge remote-tracking branch 'origin/master'
|
2020-03-27 16:34:22 +01:00 |
|
|
|
b1069b5049
|
Fix tests and checkstyle
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-27 16:30:59 +01:00 |
|
|
|
82ae081f95
|
Fix tests
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-27 16:17:45 +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 |
|
|
|
a293cb1935
|
Merge pull request #153 from hhu-propra2/docker-fix
docking
|
2020-03-27 15:16:52 +01:00 |
|
|
|
3350edb887
|
docking
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 15:15:43 +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 |
|
|
|
2b7730a3c6
|
Merge pull request #152 from hhu-propra2/fix-no-access
fix
|
2020-03-27 15:08:59 +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 |
|
|
|
13187ccf55
|
Merge pull request #151 from hhu-propra2/fixxxxx
fix
|
2020-03-27 14:55:49 +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 |
|
|
|
e387206205
|
Merge pull request #149 from hhu-propra2/invite-link-update
Invite link update
|
2020-03-27 14:40:39 +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 |
|
|
|
30abcc4085
|
fix checkstyle errors
|
2020-03-27 14:21:50 +01:00 |
|
|
|
9ccb7c77a2
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:04:32 +01:00 |
|
|
|
ee1beaeccb
|
Update ControllerServiceTest.java
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-27 13:59:30 +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 |
|
|
|
832a03c82f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# documentation/day02_progress.adoc
# documentation/day03_progress.adoc
# documentation/day04_progress.adoc
# documentation/day05_progress.adoc
# documentation/day06_progress.adoc
# documentation/day07_progress.adoc
# documentation/day08_progress.adoc
# documentation/day09_progress.adoc
# documentation/day10_progress.adoc
# documentation/day11_progress.adoc
# documentation/day12_progress.adoc
# documentation/day13_progress.adoc
# documentation/day14_progress.adoc
# documentation/day15_progress.adoc
# documentation/day16_progress.adoc
# documentation/day17_progress.adoc
# mysql/db/entrypoint/schema.sql
|
2020-03-26 17:22:46 +01:00 |
|
