|
|
f05b92994f
|
Merge pull request #83 from hhu-propra2/design-change
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:19:23 +01:00 |
|
|
|
e2dcee44af
|
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:15:21 +01:00 |
|
|
|
325c5d84f9
|
Merge branch 'master' into change-to-polymorphie
|
2020-03-17 13:05:20 +01:00 |
|
|
|
cbf69e387b
|
fix search funktion
|
2020-03-17 12:35:06 +01:00 |
|
|
|
8387b58e35
|
change createGroup Methode in ControllerService
|
2020-03-17 11:09:27 +01:00 |
|
|
|
1b8fa04826
|
change createGroup Methode in ControllerService
|
2020-03-17 10:45:03 +01:00 |
|
|
|
ca469d83af
|
even further stuff
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 17:01:44 +01:00 |
|
|
|
6991a18405
|
fix UpdateRoleEvent and DeleteUserEvent
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 16:50:32 +01:00 |
|
|
|
abd99f6a5e
|
further refactor of eventhandling
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 16:33:26 +01:00 |
|
|
|
7c2d5ecb28
|
Merge pull request #81 from hhu-propra2/keycloakRestApi
Keycloak rest api
|
2020-03-16 16:28:35 +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 |
|
|
|
7e2c1dec81
|
tested APIController
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-16 16:16:46 +01:00 |
|
|
|
ee6d2cca9f
|
Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie
|
2020-03-16 15:53:34 +01:00 |
|
|
|
4f6ec4ed96
|
Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie
|
2020-03-16 15:53:03 +01:00 |
|
|
|
266c1d6da9
|
Merge remote-tracking branch 'origin/change-to-polymorphie' into change-to-polymorphie
|
2020-03-16 15:48:16 +01:00 |
|
|
|
8d0b81b65f
|
delete applyEvent-Methods from Group
|
2020-03-16 15:47:07 +01:00 |
|
|
|
315d1d6011
|
change AddUserEvent and DeleteUserEvent
|
2020-03-16 15:46:23 +01:00 |
|
|
|
06fa9f5284
|
change UpdateRoleEvent
|
2020-03-16 15:45:26 +01:00 |
|
|
|
801ef1998c
|
Change UpdateGroupTitleEvent and UpdateGroupDescriptionEvent
|
2020-03-16 15:44:31 +01:00 |
|
|
|
e12f0c1d59
|
added @Secured and fixed
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-16 15:40:46 +01:00 |
|
|
|
22eede051b
|
change CreateGroupEvent
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
|
2020-03-16 15:36:28 +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 |
|
|
|
523b7a8f16
|
Merge pull request #80 from hhu-propra2/details-templates
Details templates
|
2020-03-16 14:55:15 +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 |
|
|
|
314336fd5a
|
Merge pull request #79 from hhu-propra2/design-changes
made ui look more consistent
|
2020-03-16 14:00:54 +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 |
|
|
|
6a310c4b1f
|
Merge pull request #78 from hhu-propra2/EventServiceTests
Event service tests
|
2020-03-16 13:28:40 +01:00 |
|
|
|
061d6d2390
|
merged with master
|
2020-03-16 13:15:54 +01:00 |
|
|
|
db11bdb8a9
|
Merge remote-tracking branch 'origin/master' into EventServiceTests
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-16 13:14:10 +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 |
|
|
|
916a386179
|
Merge pull request #73 from hhu-propra2/fix-search
fix problem where search was keeping same search throughout session a…
|
2020-03-14 23:35:38 +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 |
|
|
|
63279d8fe6
|
Merge pull request #72 from hhu-propra2/change_DTO
change EventDTO, add AddUserEventController, add the search function …
|
2020-03-14 09:33:33 +01:00 |
|
|
|
d939631eac
|
Update EventRepository.java
|
2020-03-14 09:31:48 +01:00 |
|
|
|
403b32ed76
|
Update EventRepository.java
|
2020-03-14 09:30:49 +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 |
|
|
|
c4f90e0baf
|
Merge pull request #70 from hhu-propra2/group-create
Group create
|
2020-03-13 23:07:36 +01:00 |
|
