1
Commit Graph

8 Commits

Author SHA1 Message Date
853a5bcb03 fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-26 18:21:52 +01:00
62efdb784d Merge pull request #120 from hhu-propra2/fix-add-csv
Fix add csv
2020-03-23 15:38:35 +01:00
7bae5e1184 add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-23 14:57:33 +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
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
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