 Christoph
|
344a284039
|
merge visibility and grouptype + merge createorga and createstudent + adapt to changes + finish create refactor
|
2020-04-10 23:48:31 +02:00 |
|
|
Christoph
|
5612dfba52
|
split + refine styles
|
2020-04-10 23:45:43 +02:00 |
|
|
Christoph
|
86c4507949
|
refactor createorga layout
|
2020-04-10 21:38:54 +02:00 |
|
|
Christoph
|
0cfdb06164
|
additional fragment
|
2020-04-10 21:38:32 +02:00 |
|
|
Christoph
|
78e1876a43
|
finish index refactoring
|
2020-04-10 16:57:34 +02:00 |
|
|
Christoph
|
65782c19e2
|
update style
|
2020-04-10 16:57:14 +02:00 |
|
|
Christoph
|
4c6aa407b4
|
introduce additional fragments
|
2020-04-10 16:56:32 +02:00 |
|
|
Christoph
|
2cda0f05a9
|
refine index page + outsource styling
|
2020-04-10 01:36:53 +02:00 |
|
|
Christoph
|
990306406a
|
add test data.sql
|
2020-04-10 01:36:34 +02:00 |
|
|
Christoph
|
d7d752e217
|
fix navigation
|
2020-04-09 22:05:21 +02:00 |
|
|
Christoph
|
814959c59c
|
rename templates
|
2020-04-09 21:23:11 +02:00 |
|
|
Christoph
|
93cbbaab9c
|
new mappings
|
2020-04-09 21:08:57 +02:00 |
|
|
Christoph
|
a964dbb8b6
|
new GroupCreationController mappings
|
2020-04-09 18:53:17 +02:00 |
|
|
Christoph
|
0cb56e2391
|
refactor controllers
|
2020-04-09 18:18:28 +02:00 |
|
|
Christoph
|
65ad352e03
|
update properties
|
2020-04-09 18:17:58 +02:00 |
|
|
Christoph
|
4ac3164569
|
fix some warnings
|
2020-04-08 21:08:57 +02:00 |
|
|
Christoph
|
482dde7960
|
"finish" service refactor + fix obvious bugs after refactor (everything should run pretty much)
|
2020-04-08 20:48:42 +02:00 |
|
|
Christoph
|
fbe25deda1
|
renamings + rework group creation process + remove most wrapper types
|
2020-04-07 20:27:35 +02:00 |
|
|
Christoph
|
897722fbd7
|
ControllerService + CreationController + GroupService improvements + disabled controllerservice tests, the need to be rewritten
|
2020-04-07 17:58:04 +02:00 |
|
|
Christoph
|
9c6732d2d2
|
loggers replaced with lombok, additional logging, further general service refactoring
|
2020-04-07 01:32:40 +02:00 |
|
|
Christoph
|
63fa257ec9
|
some grammar corrections
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-04-05 21:37:48 +02:00 |
|
|
Christoph
|
0c8e841c8e
|
new api tests + fixes
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 17:24:25 +02:00 |
|
|
Christoph
|
98607dcf49
|
remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:15:22 +01:00 |
|
|
[Mahgs]
|
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 |
|
|
Christoph
|
63d9b76d40
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:33:01 +01:00 |
|
|
Christoph
|
ef00c42f6f
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:45:11 +01:00 |
|
|
Christoph
|
8c29d04740
|
fix schema
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:15:05 +01:00 |
|
|
Christoph
|
56a81ce66f
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 12:57:47 +01:00 |
|
|
[Mahgs]
|
215a10c8fc
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 12:56:23 +01:00 |
|
|
Christoph
|
cc64943663
|
only show link to admin
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:35:52 +01:00 |
|
|
Christoph
|
b37f2349aa
|
secure invite link
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 20:53:59 +01:00 |
|
|
Christoph
|
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 |
|
|
Christoph
|
853a5bcb03
|
fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 18:21:52 +01:00 |
|
|
[Mahgs]
|
bacf9be7cc
|
added link to controller
|
2020-03-26 17:14:49 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
[Mahgs]
|
a1e67eac9c
|
Merge remote-tracking branch 'origin/master' into serchAll
|
2020-03-26 16:38:14 +01:00 |
|
|
[Mahgs]
|
dbe3cc7f51
|
added show all to search.html
|
2020-03-26 16:37:28 +01:00 |
|
|
Talha CaliskanandGitHub
|
72eaed4279
|
Merge pull request #146 from hhu-propra2/docker-profile-security
Docker profile security
|
2020-03-26 16:33:19 +01:00 |
|
|
Christoph
|
33e3d9d3f5
|
docker profiles, docker compose, mysql entrypoint, security
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:06:40 +01:00 |
|
|
[Mahgs]
|
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 |
|
|
[Mahgs]
|
bbf4f0b6e5
|
changed Titel in error.html
|
2020-03-26 15:03:30 +01:00 |
|
|
Lukas Ettel
|
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 |
|
|
AndiBuls
|
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 |
|
|
Max OerterandGitHub
|
f15d1f850d
|
Merge pull request #141 from hhu-propra2/prevent-private-lectures
prevent private lectures in frontend, still needs validation
|
2020-03-25 16:55:15 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
02d81d4ee8
|
prevent private lectures in frontend, still needs validation
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-25 16:44:53 +01:00 |
|
|
kasch309
|
a812de398e
|
add float for badges
|
2020-03-25 16:44:05 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
ed4a9b5728
|
add badges in group lists
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-25 15:46:58 +01:00 |
|
|
ChristophandGitHub
|
74038428df
|
Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users
Fix group search number of users
|
2020-03-25 14:48:26 +01:00 |
|
|
|
22ae8a81dc
|
partial fix search: max user anzahl display
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 14:46:02 +01:00 |
|
|
|
062a0505be
|
Deleted the html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-25 14:03:12 +01:00 |
|