 kasch309andGitHub
|
7c3942c10d
|
Merge branch 'master' into details-templates
|
2020-03-16 14:53:19 +01:00 |
|
|
kasch309
|
f4cee7ee82
|
Add template for error page, that redirects the user to the previous page (rename later)
|
2020-03-16 14:51:13 +01:00 |
|
|
Christoph
|
2c3531657d
|
csv proof of concept
|
2020-03-16 14:09:30 +01:00 |
|
|
AndiBulsandGitHub
|
314336fd5a
|
Merge pull request #79 from hhu-propra2/design-changes
made ui look more consistent
|
2020-03-16 14:00:54 +01:00 |
|
|
Christoph
|
9f464fe859
|
init csv support
|
2020-03-16 13:56:05 +01:00 |
|
|
kasch309
|
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 |
|
|
AndiBuls
|
eecfc0351f
|
made ui look more consistent
|
2020-03-16 13:31:51 +01:00 |
|
|
Lukas EttelandGitHub
|
6a310c4b1f
|
Merge pull request #78 from hhu-propra2/EventServiceTests
Event service tests
|
2020-03-16 13:28:40 +01:00 |
|
|
Mahgs
|
061d6d2390
|
merged with master
|
2020-03-16 13:15:54 +01:00 |
|
|
Mahgs
|
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 |
|
|
kasch309andGitHub
|
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 |
|
|
killerber4t
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|
|
ChristophandGitHub
|
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 |
|
|
Christoph
|
f6a3b431a9
|
add docker spring profile, mysql adapter + docker compose
|
2020-03-15 15:19:02 +01:00 |
|
|
killerber4t
|
051b3c3724
|
Merge branch 'UI-Improvements'
|
2020-03-14 23:49:30 +01:00 |
|
|
killerber4t
|
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 |
|
|
Talha CaliskanandGitHub
|
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 |
|
|
killerber4t
|
264d4ad052
|
fix problem where search was keeping same search throughout session and some UI changes
|
2020-03-14 23:29:49 +01:00 |
|
|
killerber4t
|
43a3282b67
|
added functionality to choose wether group is private or open
|
2020-03-14 22:54:40 +01:00 |
|
|
killerber4t
|
d3c5ded6d0
|
added functionality to choose wether group is private or open
|
2020-03-14 11:50:52 +01:00 |
|
|
Talha CaliskanandGitHub
|
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 |
|
|
Talha CaliskanandGitHub
|
d939631eac
|
Update EventRepository.java
|
2020-03-14 09:31:48 +01:00 |
|
|
Talha CaliskanandGitHub
|
403b32ed76
|
Update EventRepository.java
|
2020-03-14 09:30:49 +01:00 |
|
|
Talha CaliskanandGitHub
|
434a69f93d
|
Merge branch 'master' into change_DTO
|
2020-03-14 09:28:39 +01:00 |
|
|
tomvahl
|
fa79b3f136
|
change EventDTO, add AddUserEventController, add the search function in UI and backend
|
2020-03-14 09:17:32 +01:00 |
|
|
killerber4t
|
3d7681fc8f
|
add more UI improvements and functionality
|
2020-03-14 02:03:08 +01:00 |
|
|
killerber4t
|
3849b61614
|
add some UI-improvements and functionality
|
2020-03-14 01:11:56 +01:00 |
|
|
Talha CaliskanandGitHub
|
c4f90e0baf
|
Merge pull request #70 from hhu-propra2/group-create
Group create
|
2020-03-13 23:07:36 +01:00 |
|
|
AndiBulsandGitHub
|
94317af298
|
Merge branch 'master' into group-create
|
2020-03-13 16:59:00 +01:00 |
|
|
AndiBuls
|
599208cc79
|
created dropdown for Veranstaltung
|
2020-03-13 16:51:10 +01:00 |
|
|
kasch309andGitHub
|
778ec3d1aa
|
Merge pull request #68 from hhu-propra2/group-details
Group details
|
2020-03-13 16:50:47 +01:00 |
|
|
Max OerterandGitHub
|
b09feabc09
|
Merge pull request #69 from hhu-propra2/fixingLogoutButton
Fixed the Logout Button
|
2020-03-13 16:43:53 +01:00 |
|
|
kasch309andGitHub
|
a34c119113
|
Update UpdateRoleEvent.java
|
2020-03-13 16:41:27 +01:00 |
|
|
LukasEttel
|
316352c3b9
|
Fixed the Logout Button
|
2020-03-13 16:38:32 +01:00 |
|
|
kasch309andGitHub
|
e5b69c0cc0
|
Merge branch 'master' into group-details
|
2020-03-13 16:36:13 +01:00 |
|
|
kasch309
|
bfa008f9ef
|
Add file to display group details for non-members
|
2020-03-13 16:31:50 +01:00 |
|
|
kasch309
|
ad372c374a
|
Add page titles
|
2020-03-13 16:31:15 +01:00 |
|
|
killerber4t
|
46985ccca7
|
add button elements depending on various factors
|
2020-03-13 16:27:34 +01:00 |
|
|
Lukas EttelandGitHub
|
a8adbbb31c
|
Merge pull request #67 from hhu-propra2/readme
update readme
|
2020-03-13 16:18:16 +01:00 |
|
|
Mahgs
|
0071fce075
|
added Tests for checkGroup() and getMaxID()
|
2020-03-13 16:16:51 +01:00 |
|
|
Christoph
|
e48c1a78bb
|
update readme
|
2020-03-13 16:10:16 +01:00 |
|
|
killerber4t
|
e870733b37
|
Merge remote-tracking branch 'origin/group-details' into group-details
|
2020-03-13 16:09:25 +01:00 |
|
|
killerber4t
|
a1cc13eb00
|
change create
|
2020-03-13 16:08:47 +01:00 |
|
|
kasch309
|
86622b4a0c
|
add cases for different roles and visibility
|
2020-03-13 16:07:12 +01:00 |
|
|
AndiBuls
|
389cda5bc3
|
made visibility and groupType checkboxes
|
2020-03-13 15:49:12 +01:00 |
|
|
killerber4t
|
68fcc06a17
|
add details page
|
2020-03-13 15:11:23 +01:00 |
|
|
Max OerterandGitHub
|
eb969521d6
|
Merge pull request #66 from hhu-propra2/quickSwaggerAndUserRolesImpovement
quick refactor
|
2020-03-13 14:45:16 +01:00 |
|
|
LukasEttel
|
8ce3fc39b1
|
quick refactor
|
2020-03-13 14:42:17 +01:00 |
|
|
AndiBuls
|
eb43af6bec
|
added buttons for visibility option
|
2020-03-13 14:33:41 +01:00 |
|
|
kasch309
|
eeded221b4
|
Add method to find group by id
Add method to connect details.html to the controller
|
2020-03-13 14:28:16 +01:00 |
|