|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
06b308167d
|
abfangen von wenn letzter admin nicht mehr
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:00:09 +01:00 |
|
|
|
d2b5b44a0d
|
Merge remote-tracking branch 'origin/master' into max_userNumber
# Conflicts:
# src/main/resources/templates/editMembers.html
|
2020-03-19 15:55:59 +01:00 |
|
|
|
1a5dc2571a
|
add userMaximum
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-19 15:25:05 +01:00 |
|
|
|
087e0f7a13
|
Merge branch 'master' into ui
|
2020-03-19 14:32:01 +01:00 |
|
|
|
a2ae464bf0
|
add UserMaximum function
|
2020-03-19 14:28:15 +01:00 |
|
|
|
b6c5fcda65
|
fix styling, rename error page
|
2020-03-19 14:22:39 +01:00 |
|
|
|
22bfcf3a05
|
fix-search after leaving group
|
2020-03-19 14:14:54 +01:00 |
|
|
|
2192751a01
|
fix rename errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:20:14 +01:00 |
|
|
|
1c5139da8c
|
Merge refactor into error-handling + fix merge errors
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:45:07 +01:00 |
|
|
|
849c94481c
|
Merge branch 'refactoring' into error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
# src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
# src/main/java/mops/gruppen2/domain/Group.java
# src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
# src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
# src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
# src/main/java/mops/gruppen2/domain/event/Event.java
# src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
# src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
# src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
# src/main/java/mops/gruppen2/domain/exception/EventException.java
# src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
# src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
# src/main/java/mops/gruppen2/domain/exception/NoValueException.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/java/mops/gruppen2/service/GroupService.java
# src/main/java/mops/gruppen2/service/UserService.java
# src/main/resources/templates/errorRenameLater.html
|
2020-03-18 23:40:39 +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 |
|
|
|
e4d8fb05cb
|
removed unneccessary fields, decreased field visibility
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:32:05 +01:00 |
|
|
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
|
b1460abe48
|
Exception rework: clearer message + origin
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 18:49:40 +01:00 |
|
|
|
a1ee6a18cd
|
Refactor Gruppen2Controller and change redirect in addUsersFromCsv method
|
2020-03-18 18:03:02 +01:00 |
|
|
|
4b6e8eae39
|
Merge remote-tracking branch 'origin/master' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/editMembers.html
|
2020-03-18 17:36:06 +01:00 |
|
|
|
2d8472bd4a
|
Merge remote-tracking branch 'origin/master' into error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/resources/templates/errorRenameLater.html
|
2020-03-18 17:20:31 +01:00 |
|
|
|
d2c1de7c9f
|
fix for merge
|
2020-03-18 17:01:33 +01:00 |
|
|
|
b3107c98f1
|
Merge branch 'master' into edit-User
|
2020-03-18 16:43:33 +01:00 |
|
|
|
4450a091de
|
Add addUsersFromCsv in editMembers Overview
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:42:06 +01:00 |
|
|
|
4b88742776
|
add deleteUser button and reconfigure the according method
|
2020-03-18 16:36:54 +01:00 |
|
|
|
df7803f83d
|
add error handling (frontend) + exception changes
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: Mahgs <maxoerter@gmx.de>
|
2020-03-18 16:27:24 +01:00 |
|
|
|
dac0b28efb
|
fix path redirecting
|
2020-03-18 16:16:27 +01:00 |
|
|
|
6f664326c3
|
Merge remote-tracking branch 'origin/edit-User' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 15:15:06 +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 |
|
|
|
7e52935b77
|
Add check for empty csv file
and set required parameter to false
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 15:05:09 +01:00 |
|
|
|
f408391f4c
|
Refactor Gruppen2Controller
|
2020-03-18 14:40:39 +01:00 |
|
|
|
ba4a531337
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
|
2020-03-18 14:38:50 +01:00 |
|
|
|
f292700c78
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 14:27:54 +01:00 |
|
|
|
0db03f2ab5
|
Add createLecture feature
also add private checkbox again and delete the uploadCsv methods in APIController
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 14:13:58 +01:00 |
|
|
|
56f82203cd
|
fix entering group youre already part of
|
2020-03-18 14:11:52 +01:00 |
|
|
|
e2326d5f23
|
added a default route
|
2020-03-18 13:46:51 +01:00 |
|
|
|
19e8ef9c07
|
remove unnecessary line
|
2020-03-18 13:43:12 +01:00 |
|
|
|
5703ad4678
|
fix random error
|
2020-03-18 13:40:07 +01:00 |
|
|
|
051196f766
|
Add CSV methods and createLecture.html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 13:36:57 +01:00 |
|
|
|
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 |
|
|
|
b8936052cb
|
fix role recognition in detailsMember.html
|
2020-03-18 12:43:49 +01:00 |
|
