|
|
98607dcf49
|
remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:15:22 +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 |
|
|
|
56a81ce66f
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 12:57:47 +01:00 |
|
|
|
3c05dbef75
|
added javaDoc for EventService and fix Todo
fix Todo in EventRepository
|
2020-03-26 13:28:23 +01:00 |
|
|
|
ae468f4afc
|
added javaDoc for GroupService
|
2020-03-26 13:14:35 +01:00 |
|
|
|
81b93266e5
|
fixed checkstyle problems
|
2020-03-25 16:36:37 +01:00 |
|
|
|
f09b498369
|
Merge remote-tracking branch 'origin/master' into group-list-ordering
# Conflicts:
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-25 16:09:46 +01:00 |
|
|
|
f0e49dfc55
|
slight changes
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 15:57:07 +01:00 |
|
|
|
48b8617cbb
|
Merge branch 'master' into killertester
|
2020-03-25 15:52:53 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
473d58ae3b
|
partial fix search: group is displayed again after leaving
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 13:56:43 +01:00 |
|
|
|
a0d6243b5c
|
improved testing
|
2020-03-24 22:28:56 +01:00 |
|
|
|
cdb22828aa
|
remove checkGroup
|
2020-03-24 17:00:41 +01:00 |
|
|
|
9954f685f5
|
Fix Group Search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-24 16:59:45 +01:00 |
|
|
|
5c6d94753b
|
some uuid improvements
|
2020-03-24 14:37:23 +01:00 |
|
|
|
2f8a044c53
|
Merge branch 'master' into invite-link-group-id-change
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-24 14:28:30 +01:00 |
|
|
|
6adbd06e73
|
Merge remote-tracking branch 'origin/master'
|
2020-03-24 14:15:22 +01:00 |
|
|
|
15054685f5
|
Fix getAllGroupWithVisibilityPublic method
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:22:02 +01:00 |
|
|
|
d562df8826
|
temporarily disable tests + rough change from groupid to uuid + remove invitelink old system
|
2020-03-23 16:17:17 +01:00 |
|
|
|
2737febdcd
|
Fix filter in stream to find public lectures
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:12:07 +01:00 |
|
|
|
fff8a8a730
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 15:00:56 +01:00 |
|
|
|
9e588532f5
|
disable some tests
|
2020-03-23 14:41:10 +01:00 |
|
|
|
ec88a6bcad
|
change schema.sql and adapt services + optimized search
|
2020-03-23 14:10:24 +01:00 |
|
|
|
c1ce06d60f
|
Merge pull request #113 from hhu-propra2/fix-search
fix-search
|
2020-03-20 14:20:52 +01:00 |
|
|
|
10f7f8f1fc
|
fix-search
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-20 14:18:13 +01:00 |
|
|
|
71ea7eec40
|
add DeleteGoup function
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 13:45:40 +01:00 |
|
|
|
479db666a3
|
Add method to get all lectures that are public
|
2020-03-20 02:32:37 +01:00 |
|
|
|
22bfcf3a05
|
fix-search after leaving group
|
2020-03-19 14:14:54 +01:00 |
|
|
|
a05ffe9e4c
|
Fix Checkstyle Errors :(
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:17:57 +01:00 |
|
|
|
79de4a8540
|
renaming
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:40:36 +01:00 |
|
|
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
|
62397a24ef
|
update search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 16:03:34 +01:00 |
|
|
|
22172b5406
|
cleanup of the search function
|
2020-03-18 15:25:37 +01:00 |
|
|
|
2b1d6507e6
|
fix-search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 15:17:48 +01:00 |
|
|
|
522d1369ec
|
fix search
remove your Group from search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 15:09:14 +01:00 |
|
|
|
b431361eec
|
merged with master
|
2020-03-18 13:19:19 +01:00 |
|
|
|
0467d3c6a6
|
removed outdated test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 13:46:19 +01:00 |
|
|
|
cbf69e387b
|
fix search funktion
|
2020-03-17 12:35:06 +01:00 |
|
|
|
1b8fa04826
|
change createGroup Methode in ControllerService
|
2020-03-17 10:45:03 +01:00 |
|
|
|
abd99f6a5e
|
further refactor of eventhandling
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 16:33:26 +01:00 |
|
|
|
22eede051b
|
change CreateGroupEvent
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 15:36:28 +01:00 |
|
|
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|
|
|
fa79b3f136
|
change EventDTO, add AddUserEventController, add the search function in UI and backend
|
2020-03-14 09:17:32 +01:00 |
|
|
|
528ca1a2c0
|
refactor projecteventlist
|
2020-03-12 14:46:41 +01:00 |
|
|
|
13e1cf0e36
|
Merge remote-tracking branch 'origin/performance-tests' into groups-for-user
# Conflicts:
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-12 14:39:08 +01:00 |
|
|
|
f64bb0f578
|
refactor projection method
|
2020-03-12 14:37:32 +01:00 |
|
|
|
7b5f70745c
|
fix Methods
|
2020-03-12 14:03:48 +01:00 |
|
|
|
a775040abe
|
add 2 new Queries and 2 Methods for UserService
|
2020-03-12 13:55:10 +01:00 |
|
|
|
d102f9b0ee
|
fixed GroupServiceTest for new Method in GroupService
|
2020-03-11 13:52:26 +01:00 |
|
