1
Commit Graph

72 Commits

Author SHA1 Message Date
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
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
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
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
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
e870733b37 Merge remote-tracking branch 'origin/group-details' into group-details 2020-03-13 16:09:25 +01:00
a1cc13eb00 change create 2020-03-13 16:08:47 +01:00
86622b4a0c add cases for different roles and visibility 2020-03-13 16:07:12 +01:00
389cda5bc3 made visibility and groupType checkboxes 2020-03-13 15:49:12 +01:00
68fcc06a17 add details page 2020-03-13 15:11:23 +01:00
eb43af6bec added buttons for visibility option 2020-03-13 14:33:41 +01:00
7bbdbad28e Add details.html to display group details 2020-03-13 14:27:38 +01:00
c73cf2a870 change color of submit button in search.html and create.html 2020-03-12 16:25:39 +01:00
40c04f5bc4 add href to group title, improve display of several groups 2020-03-12 16:06:36 +01:00
ac4fc24431 Edit index.html 2020-03-12 15:49:02 +01:00
2aeff7ef09 Edit index.html 2020-03-12 15:43:12 +01:00
9f40df9d59 add Usergroups to controller 2020-03-12 15:14:46 +01:00
7e1242d0a0 Merge branch 'html-gruppe' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into html-gruppe 2020-03-09 23:22:14 +01:00
61e2d0edba added Creating Groups to frontend and saving them in Database. Also prepared some Methods for Snapshot db 2020-03-09 23:21:29 +01:00
9b127daea0 Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe 2020-03-09 16:56:24 +01:00
d4e4834fe5 add submit button 2020-03-09 16:24:06 +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
a1ec6b28d4 Merge branch 'event-db' into html-gruppe
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/entities/Teilnehmer.java
2020-03-09 14:34:02 +01:00
7379330a86 add template for index 2020-03-09 13:24:11 +01:00
6d32092dcf refine swagger example 2020-03-07 17:21:17 +01:00
64f54ada27 slight changes to package structure 2020-03-06 20:03:15 +01:00