1
Commit Graph

887 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
566c99565a Merge pull request #143 from hhu-propra2/refactor-controllerService
Refactor createGroups in controller service
2020-03-26 14:55:00 +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
e7df8a50e2 Merge pull request #142 from hhu-propra2/refactor-ValidationService
Refactor validation service
2020-03-26 14:19:46 +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