|
|
d3608e5043
|
changed template design; title and description now scales with window size
mitgemacht haben Martin, Lukas, Talha
|
2020-03-20 16:42:12 +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 |
|
|
|
42154bd2d0
|
Merge pull request #112 from hhu-propra2/delete-group-event
Delete group event
|
2020-03-20 14:05:29 +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 |
|
|
|
33a5f9053b
|
Merge pull request #111 from hhu-propra2/lecture-parent-in-create
Lecture parent in create
|
2020-03-20 12:53:26 +01:00 |
|
|
|
acac3ca17c
|
Change badge colour
|
2020-03-20 02:59:41 +01:00 |
|
|
|
5b106d7746
|
Add function that collapses the drop-down list if the lecture checkbox is checked
|
2020-03-20 02:39:59 +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 |
|
|
|
d43e62bb1d
|
Merge pull request #110 from hhu-propra2/merge-create-sites
Merge create sites
|
2020-03-19 18:42:02 +01:00 |
|
|
|
ca1743f175
|
Merge pull request #109 from hhu-propra2/max_userNumber
Max user number
|
2020-03-19 17:34:01 +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 |
|
|
|
1a72ba379f
|
Merge remote-tracking branch 'origin/max_userNumber' into max_userNumber
|
2020-03-19 16:54:05 +01:00 |
|
|
|
2eb9acea51
|
fix table and buttons
|
2020-03-19 16:53:09 +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 |
|
|
|
f40268bc13
|
Merge pull request #105 from hhu-propra2/max_userNumber
Max user number
|
2020-03-19 16:34:53 +01:00 |
|
|
|
feb21a512b
|
fix tests
|
2020-03-19 16:32:24 +01:00 |
|
|
|
89a40cb64b
|
removed unwanted filed
|
2020-03-19 16:30:28 +01:00 |
|
|
|
7358d80528
|
add data.sql to create groups
|
2020-03-19 16:18:46 +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 |
|
|
|
c343b5adbe
|
fix button to leave editmembers
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-19 15:49:53 +01:00 |
|
|
|
46203e43f8
|
Merge branch 'max_userNumber' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into max_userNumber
|
2020-03-19 15:40:16 +01:00 |
|
|
|
4b5cdee975
|
fix createVeranstaltung
|
2020-03-19 15:40:00 +01:00 |
|
|
|
ca59309716
|
add display of actual and maximum users
|
2020-03-19 15:35:58 +01:00 |
|
|
|
a1e976a805
|
add exception
|
2020-03-19 15:30:19 +01:00 |
|
|
|
1a5dc2571a
|
add userMaximum
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-19 15:25:05 +01:00 |
|
|
|
abae802e0c
|
add exception
|
2020-03-19 15:11:20 +01:00 |
|
|
|
68ec062fdb
|
crated an exeption
|
2020-03-19 14:39:54 +01:00 |
|
|
|
d9388c282c
|
Merge pull request #103 from hhu-propra2/ui
fix styling, rename error page
|
2020-03-19 14:34:48 +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 |
|
|
|
560800e847
|
Merge pull request #102 from hhu-propra2/fix-search-after-leaving
fix-search after leaving group
|
2020-03-19 14:20:19 +01:00 |
|
|
|
22bfcf3a05
|
fix-search after leaving group
|
2020-03-19 14:14:54 +01:00 |
|
|
|
8291b5c41e
|
Merge pull request #101 from hhu-propra2/error-handling
Error handling
|
2020-03-19 13:12:20 +01:00 |
|
|
|
2192751a01
|
fix rename errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:20:14 +01:00 |
|
|
|
fdd9d44aac
|
fix merge errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:00:33 +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 |
|
