1
Commit Graph

31 Commits

Author SHA1 Message Date
b3107c98f1 Merge branch 'master' into edit-User 2020-03-18 16:43:33 +01:00
42721e06fc Improve styling on several templates 2020-03-18 16:32:27 +01:00
dad86bb4b2 Merge remote-tracking branch 'origin/edit-User' into edit-User
# Conflicts:
#	src/main/resources/templates/index.html
2020-03-18 16:18:14 +01:00
dac0b28efb fix path redirecting 2020-03-18 16:16:27 +01:00
e0db7584ac Improve styling on several templates 2020-03-18 16:00:11 +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
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
5f1cdca4ee fix text overflow in groupdescription 2020-03-18 13:21:44 +01:00
a6667e4091 fix text overflow in groupdescription 2020-03-18 13:08:35 +01:00
0828c278dc fix visibility recognition in detailsMember.html 2020-03-18 12:47:03 +01:00
b8936052cb fix role recognition in detailsMember.html 2020-03-18 12:43:49 +01:00
9491f83cca fix roles on detailsMember.html 2020-03-17 16:57:13 +01:00
a67d8fa993 Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User 2020-03-17 16:44:09 +01:00
47ee171070 fix roles on detailsMember.html 2020-03-17 16:42:31 +01:00
b0186eee66 fix edit members button (add margin) 2020-03-17 16:32:04 +01:00
b648920c42 fix template 2020-03-17 16:29:55 +01:00
a868ea86b4 add edit-members to controller
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 15:31:53 +01:00
aa843f1d8e fix html 2020-03-17 14:46:20 +01:00
61e007e4d8 add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
2020-03-17 14:36:55 +01:00
bae8805972 fix styling, add missing attributes 2020-03-17 13:47:09 +01:00
e2978e10d0 fix visibility in controller 2020-03-16 12:37:45 +01:00
1ad3ad8bab Merge remote-tracking branch 'origin/UI-Improvements'
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
2020-03-14 23:47:41 +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
d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +01:00
3d7681fc8f add more UI improvements and functionality 2020-03-14 02:03:08 +01:00
3849b61614 add some UI-improvements and functionality 2020-03-14 01:11:56 +01:00
ad372c374a Add page titles 2020-03-13 16:31:15 +01:00
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
86622b4a0c add cases for different roles and visibility 2020-03-13 16:07:12 +01:00