|
|
89354eec26
|
link now correct displayed
|
2020-03-24 15:09:44 +01:00 |
|
|
|
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 |
|
|
|
5c6d94753b
|
some uuid improvements
|
2020-03-24 14:37:23 +01:00 |
|
|
|
59bea22d8e
|
Add changeMetadata feature
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
|
2020-03-24 14:34:52 +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 |
|
|
|
c844f5d4fa
|
some uuid improvements
|
2020-03-24 14:12:32 +01:00 |
|
|
|
64fe9c387d
|
Merge branch 'master' into killertester
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-24 13:08:58 +01:00 |
|
|
|
fd3a118b04
|
refactoring test
|
2020-03-24 13:07:55 +01:00 |
|
|
|
2eca5e1849
|
fix api etc
|
2020-03-23 17:01:01 +01:00 |
|
|
|
14d657131a
|
Merge remote-tracking branch 'origin/showInviteLink' into showInviteLink
# Conflicts:
# src/main/resources/templates/detailsMember.html
|
2020-03-23 16:54:20 +01:00 |
|
|
|
6fc0cafc61
|
link is now displayed correctly but still issus with localhost and keykloak
Co-authored-by: Max Oerter <33197299+mahgs@users.noreply.github.com>
|
2020-03-23 16:53:32 +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 |
|
|
|
9023fb72a7
|
fix nullpointer
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 15:56:15 +01:00 |
|
|
|
62efdb784d
|
Merge pull request #120 from hhu-propra2/fix-add-csv
Fix add csv
|
2020-03-23 15:38:35 +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 |
|
|
|
fff8a8a730
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 15:00:56 +01:00 |
|
|
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +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 |
|
|
|
2a6cf0e529
|
added create link to createOrga
|
2020-03-23 13:27:11 +01:00 |
|
|
|
9b1ad8b3da
|
Merge remote-tracking branch 'origin/master' into showInviteLink
|
2020-03-23 13:16:43 +01:00 |
|
|
|
06bd77b9e6
|
merge
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 13:14:22 +01:00 |
|
|
|
676245d44d
|
Merge remote-tracking branch 'origin/master' into fixSomeErrors
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
|
2020-03-23 13:05:32 +01:00 |
|
|
|
4d77e2905f
|
fix UserMax when added through orga
|
2020-03-23 13:01:19 +01:00 |
|
|
|
6c4a598816
|
link supplied to getMapping in details.html
|
2020-03-20 16:47:17 +01:00 |
|
|
|
069885a771
|
add adjusting UserMax
|
2020-03-20 16:38:39 +01:00 |
|
|
|
a13bdbf6b5
|
Fixed unauthoriced acsess to group-details
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-20 16:33:56 +01:00 |
|
|
|
8d0c3987d2
|
prepare search optimization
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-20 16:00:07 +01:00 |
|
|
|
ef946c9f82
|
automatic group size for ogra
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 15:57:16 +01:00 |
|
|
|
b6c013e254
|
fix GroupDelete
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 15:09:27 +01:00 |
|
|
|
cb9750efc6
|
fixed double csv import
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-20 14:49:03 +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 |
|
|
|
73f6798c2c
|
if group empty gets delete
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 14:00:41 +01:00 |
|
|
|
71ea7eec40
|
add DeleteGoup function
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 13:45:40 +01:00 |
|
|
|
066d425d35
|
Add badge that displays parent group in detail site
|
2020-03-20 02:38:24 +01:00 |
|
|
|
820782c2ce
|
Add feature to link a group to a lecture
|
2020-03-20 02:36:51 +01:00 |
|
|
|
479db666a3
|
Add method to get all lectures that are public
|
2020-03-20 02:32:37 +01:00 |
|
|
|
b24f6d273f
|
Fix merge with master
|
2020-03-19 17:24:10 +01:00 |
|
|
|
ef044cbdf7
|
Merge remote-tracking branch 'origin/master' into csv-error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/User.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/createStudent.html
|
2020-03-19 17:01:32 +01:00 |
|
|
|
cd1d7183e7
|
Add exceptions for csv errors
|
2020-03-19 16:51:40 +01:00 |
|
|
|
dc11536db3
|
Merge Erstellen and Veranstaltung into a single site
add two Erstellen sites, one for orga and one for student
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-19 16:50:52 +01:00 |
|
|
|
fd4c4ba0f1
|
Merge pull request #107 from hhu-propra2/entadminisierung
Entadminisierung
|
2020-03-19 16:45:26 +01:00 |
|
|
|
59487fc4c7
|
Fix User class so that csv works
|
2020-03-19 16:44:08 +01:00 |
|
|
|
5917d9b0fc
|
fixed exeptionname
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-19 16:42:27 +01:00 |
|
|
|
a96981515f
|
Merge remote-tracking branch 'origin/master' into entadminisierung
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/User.java
# src/main/resources/templates/editMembers.html
|
2020-03-19 16:14:57 +01:00 |
|
|
|
cf46a549dc
|
admin change when leaving group
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-19 16:10:35 +01:00 |
|
