1
Commit Graph

23 Commits

Author SHA1 Message Date
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
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
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
2ba913f2c8 Formatting
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-18 20:18:03 +01:00
b3107c98f1 Merge branch 'master' into edit-User 2020-03-18 16:43:33 +01:00
af573f2353 Add list entry in 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:22 +01:00
a6667e4091 fix text overflow in groupdescription 2020-03-18 13:08:35 +01:00
d2f71e6390 delete table column 2020-03-17 16:11:24 +01:00
e2dcee44af added deleted button in search.html and changed design of index.html 2020-03-17 13:15:21 +01:00
7c3942c10d Merge branch 'master' into details-templates 2020-03-16 14:53:19 +01:00
54d5028693 Add template for detailsNoMember.html, that displays the details when you search a page.
Add connection to the controller
2020-03-16 13:31:51 +01:00
eecfc0351f made ui look more consistent 2020-03-16 13:31:51 +01:00
264d4ad052 fix problem where search was keeping same search throughout session and some UI changes 2020-03-14 23:29:49 +01:00
434a69f93d Merge branch 'master' into change_DTO 2020-03-14 09:28:39 +01:00
fa79b3f136 change EventDTO, add AddUserEventController, add the search function in UI and backend 2020-03-14 09:17:32 +01:00
ad372c374a Add page titles 2020-03-13 16:31:15 +01:00
c73cf2a870 change color of submit button in search.html and create.html 2020-03-12 16:25:39 +01:00
e0630478a0 Add template for search.html 2020-03-09 15:28:08 +01:00
05d599ad0f add Mapping for search.html and create.html in Controller 2020-03-09 15:06:14 +01:00
2645e4dd84 change create.html index.html and search.html 2020-03-06 14:58:31 +01:00
c5b970ffc9 change index.html 2020-03-06 14:21:43 +01:00