|
|
8e914d8011
|
Refactoring
|
2020-03-25 13:36:47 +01:00 |
|
|
|
efc3625215
|
Change active list entry of detailsNoMember.html
|
2020-03-24 15:44:34 +01:00 |
|
|
|
1b469ca363
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 17:08:46 +01:00 |
|
|
|
72a71b1ada
|
fix colors for uniformity
|
2020-03-23 17:08:20 +01:00 |
|
|
|
c37535ea05
|
Display infinite members message in group search details site
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-23 16:22:57 +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 |
|
|
|
7e021075eb
|
Merge remote-tracking branch 'origin/master' into fixSomeErrors
|
2020-03-23 13:16:06 +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 |
|
|
|
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 |
|
|
|
acac3ca17c
|
Change badge colour
|
2020-03-20 02:59:41 +01:00 |
|
|
|
066d425d35
|
Add badge that displays parent group in detail site
|
2020-03-20 02:38:24 +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 |
|
|
|
c631f243a1
|
Refactor indentation in html files
|
2020-03-18 18:00:47 +01:00 |
|
|
|
b3107c98f1
|
Merge branch 'master' into edit-User
|
2020-03-18 16:43:33 +01:00 |
|
|
|
e0db7584ac
|
Improve styling on several templates
|
2020-03-18 16:00:11 +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 |
|
|
|
bd9e1bb28e
|
add Join Group
Mitgearbeitet hat:
Karla
Andi
|
2020-03-17 15:11:40 +01:00 |
|
|
|
4bcf931246
|
spacing still wrong
|
2020-03-17 13:58:34 +01:00 |
|
|
|
41833b2a07
|
fixed spacing for details
|
2020-03-17 13:56:03 +01:00 |
|
|
|
bae8805972
|
fix styling, add missing attributes
|
2020-03-17 13:47:09 +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 |
|
|
|
bfa008f9ef
|
Add file to display group details for non-members
|
2020-03-13 16:31:50 +01:00 |
|
