|
|
27403f2712
|
Update editMembers.html
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 15:57:25 +01:00 |
|
|
|
6aea99e903
|
fix userMax
|
2020-03-23 15:47:59 +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 |
|
|
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +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 |
|
|
|
d43e62bb1d
|
Merge pull request #110 from hhu-propra2/merge-create-sites
Merge create sites
|
2020-03-19 18:42:02 +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 |
|
|
|
2eb9acea51
|
fix table and buttons
|
2020-03-19 16:53:09 +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 |
|
|
|
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 |
|
|
|
087e0f7a13
|
Merge branch 'master' into ui
|
2020-03-19 14:32:01 +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 |
|
|
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
|
c631f243a1
|
Refactor indentation in html files
|
2020-03-18 18:00:47 +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 |
|
|
|
1fbfd49781
|
show file thats choosen to load up
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:55:07 +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 |
|
|
|
dac0b28efb
|
fix path redirecting
|
2020-03-18 16:16:27 +01:00 |
|
|
|
9aa7122779
|
Improve styling on several templates
|
2020-03-18 15:23:26 +01:00 |
|
|
|
75a4701bd0
|
fix table and functionality
|
2020-03-18 14:21:05 +01:00 |
|
|
|
5703ad4678
|
fix random error
|
2020-03-18 13:40:07 +01:00 |
|
|
|
06eb174c42
|
add table column
|
2020-03-17 16:56:38 +01:00 |
|
|
|
e9199857b7
|
change table class
|
2020-03-17 16:35:00 +01:00 |
|
|
|
b648920c42
|
fix template
|
2020-03-17 16:29:55 +01:00 |
|
|
|
9b6a168fb6
|
Add rough template for editing embers of a group
|
2020-03-17 15:55:51 +01:00 |
|
