|
|
72a71b1ada
|
fix colors for uniformity
|
2020-03-23 17:08:20 +01:00 |
|
|
|
341103b554
|
add scrollbar, fix template
|
2020-03-23 17:07:37 +01:00 |
|
|
|
62efdb784d
|
Merge pull request #120 from hhu-propra2/fix-add-csv
Fix add csv
|
2020-03-23 15:38:35 +01:00 |
|
|
|
cfb13a385c
|
fix th:name
|
2020-03-23 15:34:31 +01:00 |
|
|
|
feb1223ea8
|
fix styling
|
2020-03-23 15:27:08 +01:00 |
|
|
|
4b5634e45f
|
Merge pull request #118 from hhu-propra2/optimize-db
change schema.sql and adapt services + optimized search
|
2020-03-23 15:00:08 +01:00 |
|
|
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +01:00 |
|
|
|
4cb8e4006b
|
fix data.sql
|
2020-03-23 14:44:59 +01:00 |
|
|
|
56eee36c51
|
disable some tests
|
2020-03-23 14:41:44 +01:00 |
|
|
|
ec88a6bcad
|
change schema.sql and adapt services + optimized search
|
2020-03-23 14:10:24 +01:00 |
|
|
|
25df317be4
|
Merge pull request #117 from hhu-propra2/ui
change color of buttons and badge to match the rest
|
2020-03-23 13:28:54 +01:00 |
|
|
|
d8242022df
|
change color of buttons and badge to match the rest
|
2020-03-23 13:25:15 +01:00 |
|
|
|
cfeaf7a5d4
|
Merge pull request #116 from hhu-propra2/fixSomeErrors
Fix some errors
|
2020-03-23 13:23:46 +01:00 |
|
|
|
7e021075eb
|
Merge remote-tracking branch 'origin/master' into fixSomeErrors
|
2020-03-23 13:16:06 +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 |
|
|
|
37e0f7f8f7
|
Merge pull request #115 from hhu-propra2/design-fix
Design fix
|
2020-03-23 13:06:32 +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 |
|
|
|
de2c1ae245
|
Merge branch 'master' into design-fix
|
2020-03-23 12:57:57 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6506ce7bbe
|
Merge pull request #114 from hhu-propra2/adjust_group_size
Adjust group size
|
2020-03-20 16:08:58 +01:00 |
|
|
|
755f76ef58
|
Update createOrga.html
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 16:06:11 +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 |
|
|
|
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 |
|
