|
|
5703ad4678
|
fix random error
|
2020-03-18 13:40:07 +01:00 |
|
|
|
051196f766
|
Add CSV methods and createLecture.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:57 +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 |
|
|
|
722cd80831
|
Merge remote-tracking branch 'origin/master' into group-invite-links
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/repository/EventRepository.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-18 13:18:34 +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 |
|
|
|
4b1627a993
|
Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/APIController.java
# src/main/resources/templates/create.html
|
2020-03-18 03:23:22 +01:00 |
|
|
|
179062eed9
|
Add createLecture for orga only
Co-Authored-By: andibuls <andibuls@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-17 17:07:30 +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 |
|
|
|
6e067d1b47
|
Fix InviteLink DB Schema + Implement Frontend InviteLink Handling
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 16:16:58 +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 |
|
|
|
db11178ccd
|
Add db table for invite links
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 13:25:37 +01:00 |
|
|
|
e2dcee44af
|
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:15:21 +01:00 |
|
|
|
6c8a5fbe78
|
changed docker.properties
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-16 16:25:04 +01:00 |
|
|
|
d0a42c4569
|
Merge remote-tracking branch 'origin/master' into keycloakRestApi
|
2020-03-16 16:18:25 +01:00 |
|
|
|
3f144d14e4
|
update KeyCloakConfig like in the KeycloakDemo
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-16 15:16:43 +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 |
|
|
|
2c3531657d
|
csv proof of concept
|
2020-03-16 14:09:30 +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 |
|
|
|
f4ad729efd
|
Merge pull request #76 from hhu-propra2/fix-vis-in-db
partially fix vis in db
|
2020-03-16 13:04:05 +01:00 |
|
|
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|
|
|
9e1a04f723
|
Merge pull request #75 from hhu-propra2/docker-profile
add docker spring profile, mysql adapter + docker compose
|
2020-03-16 12:36:03 +01:00 |
|
|
|
f6a3b431a9
|
add docker spring profile, mysql adapter + docker compose
|
2020-03-15 15:19:02 +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 |
|
