|
|
0963970eac
|
add arc42 full file
|
2020-03-27 16:36:04 +01:00 |
|
|
|
b79326f6d8
|
Merge remote-tracking branch 'origin/master'
|
2020-03-27 16:34:22 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b50783cd8c
|
merge fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:21:28 +01:00 |
|
|
|
82e9611d47
|
merge fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:20:58 +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 |
|
|
|
482d556f51
|
add arc42 full file
|
2020-03-26 17:03:59 +01:00 |
|
|
|
12eb4b9534
|
add more testcases
|
2020-03-26 16:59:50 +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 |
|
|
|
4a2ed5e755
|
Merge pull request #148 from hhu-propra2/documentation-merge
Documentation merge
|
2020-03-26 16:45:51 +01:00 |
|
|
|
46e01aed9b
|
add last file
|
2020-03-26 16:41:31 +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 |
|
|
|
8956b7a91a
|
add documentation into branch to merge into master
|
2020-03-26 16:40:23 +01:00 |
|
|
|
598ec3ea6e
|
Merge pull request #147 from hhu-propra2/serchAll
Serch all
|
2020-03-26 16:40:16 +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 |
|
|
|
666bab0c03
|
entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:35:31 +01:00 |
|
|
|
72eaed4279
|
Merge pull request #146 from hhu-propra2/docker-profile-security
Docker profile security
|
2020-03-26 16:33:19 +01:00 |
|
|
|
63c924dbb9
|
add mysql schema entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:30:29 +01:00 |
|
|
|
083044bbbb
|
update dockerfile: pull wait-for-it from github
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:28:28 +01:00 |
|
|
|
a79ab6473b
|
add more testcases
|
2020-03-26 16:26:07 +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 |
|
