|
|
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 |
|
|
|
b89b47ec81
|
set redirection to index instead of previous page
|
2020-03-18 14:21:39 +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 |
|
|
|
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 |
|
|
|
61dc1eb928
|
Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User
|
2020-03-17 16:57:25 +01:00 |
|
|
|
9491f83cca
|
fix roles on detailsMember.html
|
2020-03-17 16:57:13 +01:00 |
|
|
|
06eb174c42
|
add table column
|
2020-03-17 16:56:38 +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 |
|
|
|
e9199857b7
|
change table class
|
2020-03-17 16:35:00 +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 |
|
|
|
3036f76b37
|
Merge remote-tracking branch 'origin/master' into edit-User
|
2020-03-17 16:16:44 +01:00 |
|
|
|
d2f71e6390
|
delete table column
|
2020-03-17 16:11:24 +01:00 |
|
|
|
9b6a168fb6
|
Add rough template for editing embers of a group
|
2020-03-17 15:55:51 +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 |
|
|
|
bd9e1bb28e
|
add Join Group
Mitgearbeitet hat:
Karla
Andi
|
2020-03-17 15:11:40 +01:00 |
|
|
|
2738b6a35f
|
Merge branch 'delete-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into delete-User
|
2020-03-17 14:47:02 +01:00 |
|
|
|
aa843f1d8e
|
fix html
|
2020-03-17 14:46:20 +01:00 |
|
|
|
ea0810174a
|
Merge branch 'master' into delete-User
|
2020-03-17 14:39:02 +01:00 |
|
|
|
61e007e4d8
|
add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:36:55 +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 |
|
|
|
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 |
|
|
|
f4cee7ee82
|
Add template for error page, that redirects the user to the previous page (rename later)
|
2020-03-16 14:51:13 +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 |
|
|
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|
|
|
051b3c3724
|
Merge branch 'UI-Improvements'
|
2020-03-14 23:49:30 +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 |
|
|
|
43a3282b67
|
added functionality to choose wether group is private or open
|
2020-03-14 22:54:40 +01:00 |
|
|
|
d3c5ded6d0
|
added functionality to choose wether group is private or open
|
2020-03-14 11:50:52 +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 |
|
|
|
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 |
|
|
|
94317af298
|
Merge branch 'master' into group-create
|
2020-03-13 16:59:00 +01:00 |
|
|
|
599208cc79
|
created dropdown for Veranstaltung
|
2020-03-13 16:51:10 +01:00 |
|
|
|
bfa008f9ef
|
Add file to display group details for non-members
|
2020-03-13 16:31:50 +01:00 |
|
|
|
ad372c374a
|
Add page titles
|
2020-03-13 16:31:15 +01:00 |
|
