 [Mahgs]
|
f2c2a11470
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 16:40:53 +01:00 |
|
|
[Mahgs]
|
5ee92d5cd6
|
fix
|
2020-03-27 16:40:30 +01:00 |
|
|
[Mahgs]
|
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 |
|
|
[Mahgs]
|
9a0035ba1a
|
added javaDoc Comments to ControllerService
|
2020-03-27 15:58:39 +01:00 |
|
|
[Mahgs]
|
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 |
|
|
[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 |
|
|
[Mahgs]
|
64dd8f5ad3
|
Merge remote-tracking branch 'origin/invite-link-update' into invite-link-update
|
2020-03-27 14:38:17 +01:00 |
|
|
[Mahgs]
|
9c984f8572
|
fixed checkstyle in tests
|
2020-03-27 14:38:07 +01:00 |
|
|
[Mahgs]
|
215a10c8fc
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 12:56:23 +01:00 |
|
|
[Mahgs]
|
bacf9be7cc
|
added link to controller
|
2020-03-26 17:14:49 +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 |
|
|
[Mahgs]
|
41e035d901
|
a
|
2020-03-26 15:38:39 +01:00 |
|
|
[Mahgs]
|
25595c9380
|
merged with master
|
2020-03-26 15:11:12 +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 |
|
|
[Mahgs]
|
4d0968b2d9
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-26 14:25:01 +01:00 |
|
|
[Mahgs]
|
de0e8ee4fe
|
fixed some problems in WebController
|
2020-03-26 13:48:17 +01:00 |
|
|
[Mahgs]
|
2c6c844edd
|
delete InviteLinkDTO
|
2020-03-26 13:38:11 +01:00 |
|
|
[Mahgs]
|
eb59a70dd4
|
added javaDoc for UserService
|
2020-03-26 13:32:48 +01:00 |
|
|
[Mahgs]
|
3c05dbef75
|
added javaDoc for EventService and fix Todo
fix Todo in EventRepository
|
2020-03-26 13:28:23 +01:00 |
|
|
[Mahgs]
|
ae468f4afc
|
added javaDoc for GroupService
|
2020-03-26 13:14:35 +01:00 |
|
|
[Mahgs]
|
b193327f9c
|
Merge remote-tracking branch 'origin/master' into checkstyle
|
2020-03-25 16:47:08 +01:00 |
|
|
[Mahgs]
|
81b93266e5
|
fixed checkstyle problems
|
2020-03-25 16:36:37 +01:00 |
|
|
[Mahgs]
|
79619a9476
|
added pageNotFoundException on not existing routs
|
2020-03-24 16:46:23 +01:00 |
|
|
[Mahgs]
|
2d3e935d64
|
merged with master and fixed some problems
|
2020-03-24 16:31:55 +01:00 |
|
|
[Mahgs]
|
6cd41d5e29
|
Merge remote-tracking branch 'origin/master' into showInviteLink
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/controller/MopsController.java
# src/main/java/mops/gruppen2/repository/InviteLinkRepository.java
# src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java
|
2020-03-24 15:32:56 +01:00 |
|
|
[Mahgs]
|
4b6257c9f0
|
set exceptions on join group
added emoji to error.html <- wichtig
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-24 15:24:24 +01:00 |
|
|
[Mahgs]
|
89354eec26
|
link now correct displayed
|
2020-03-24 15:09:44 +01:00 |
|
|
[Mahgs]
|
60837d8cf3
|
Merge remote-tracking branch 'origin/master' into showInviteLink
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-24 14:51:33 +01:00 |
|
|
|
a03d3f5b69
|
link displayed in UI
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
|
2020-03-23 15:08:39 +01:00 |
|
|
|
892c734265
|
link displayed in UI
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
|
2020-03-23 14:14:24 +01:00 |
|
|
[Mahgs]
|
2a6cf0e529
|
added create link to createOrga
|
2020-03-23 13:27:11 +01:00 |
|
|
[Mahgs]
|
9b1ad8b3da
|
Merge remote-tracking branch 'origin/master' into showInviteLink
|
2020-03-23 13:16:43 +01:00 |
|
|
[Mahgs]
|
6c4a598816
|
link supplied to getMapping in details.html
|
2020-03-20 16:47:17 +01:00 |
|
|
[Mahgs]
|
69141705ab
|
fixed tests
|
2020-03-18 14:22:23 +01:00 |
|
|
[Mahgs]
|
b236e3bb9d
|
changed checkGroup Method to a Query
|
2020-03-18 14:09:30 +01:00 |
|
|
[Mahgs]
|
523d7d2ad9
|
added a default route
|
2020-03-18 13:52:48 +01:00 |
|
|
[Mahgs]
|
e2326d5f23
|
added a default route
|
2020-03-18 13:46:51 +01:00 |
|
|
[Mahgs]
|
b431361eec
|
merged with master
|
2020-03-18 13:19:19 +01:00 |
|
|
[Mahgs]
|
722cd80831
|
Merge remote-tracking branch 'origin/master' into group-invite-links
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/repository/EventRepository.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-18 13:18:34 +01:00 |
|
|
[Mahgs]andChristoph
|
906585ce9a
|
added InviteLinkRepository
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 13:42:35 +01:00 |
|
|
|
6c8a5fbe78
|
changed docker.properties
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-16 16:25:04 +01:00 |
|
|
[Mahgs]
|
d0a42c4569
|
Merge remote-tracking branch 'origin/master' into keycloakRestApi
|
2020-03-16 16:18:25 +01:00 |
|
|
|
7e2c1dec81
|
tested APIController
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-16 16:16:46 +01:00 |
|
|
|
e12f0c1d59
|
added @Secured and fixed
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-16 15:40:46 +01:00 |
|