 Lukas Ettel
|
14d657131a
|
Merge remote-tracking branch 'origin/showInviteLink' into showInviteLink
# Conflicts:
# src/main/resources/templates/detailsMember.html
|
2020-03-23 16:54:20 +01:00 |
|
|
Lukas EttelandMax Oerter
|
6fc0cafc61
|
link is now displayed correctly but still issus with localhost and keykloak
Co-authored-by: Max Oerter <33197299+mahgs@users.noreply.github.com>
|
2020-03-23 16:53:32 +01:00 |
|
|
Lukas EttelandGitHub
|
d43e62bb1d
|
Merge pull request #110 from hhu-propra2/merge-create-sites
Merge create sites
|
2020-03-19 18:42:02 +01:00 |
|
|
|
5917d9b0fc
|
fixed exeptionname
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-19 16:42:27 +01:00 |
|
|
Lukas Ettel
|
89a40cb64b
|
removed unwanted filed
|
2020-03-19 16:30:28 +01:00 |
|
|
Lukas Ettel
|
a96981515f
|
Merge remote-tracking branch 'origin/master' into entadminisierung
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/User.java
# src/main/resources/templates/editMembers.html
|
2020-03-19 16:14:57 +01:00 |
|
|
|
cf46a549dc
|
admin change when leaving group
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-19 16:10:35 +01:00 |
|
|
|
06b308167d
|
abfangen von wenn letzter admin nicht mehr
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-19 16:00:09 +01:00 |
|
|
Lukas Ettel
|
68ec062fdb
|
crated an exeption
|
2020-03-19 14:39:54 +01:00 |
|
|
Lukas EttelandGitHub
|
8291b5c41e
|
Merge pull request #101 from hhu-propra2/error-handling
Error handling
|
2020-03-19 13:12:20 +01:00 |
|
|
Lukas EttelandGitHub
|
01c0cac2a2
|
Merge pull request #100 from hhu-propra2/import-csv-in-overview
Import csv in editMembers overview
|
2020-03-18 19:00:00 +01:00 |
|
|
Lukas EttelandGitHub
|
f4513e4f99
|
Merge pull request #99 from hhu-propra2/edit-User
Edit user
|
2020-03-18 17:12:00 +01:00 |
|
|
|
1fbfd49781
|
show file thats choosen to load up
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:55:07 +01:00 |
|
|
Lukas Ettel
|
49c38b583c
|
Quick fix on master
|
2020-03-17 16:13:29 +01:00 |
|
|
Lukas Ettel
|
991bcf2aaa
|
Implementation of old EventExeptions
|
2020-03-17 15:57:26 +01:00 |
|
|
|
0467d3c6a6
|
removed outdated test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 13:46:19 +01:00 |
|
|
Lukas Ettel
|
325c5d84f9
|
Merge branch 'master' into change-to-polymorphie
|
2020-03-17 13:05:20 +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 |
|
|
|
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 |
|
|
Lukas EttelandGitHub
|
6a310c4b1f
|
Merge pull request #78 from hhu-propra2/EventServiceTests
Event service tests
|
2020-03-16 13:28:40 +01:00 |
|
|
Lukas EttelandGitHub
|
a8adbbb31c
|
Merge pull request #67 from hhu-propra2/readme
update readme
|
2020-03-13 16:18:16 +01:00 |
|
|
Lukas EttelandGitHub
|
c508c900d1
|
Merge pull request #54 from hhu-propra2/newEventImplementation
Added DeleteGroupEvent and GroupDoesNotExistException
|
2020-03-10 15:13:14 +01:00 |
|
|
Lukas EttelandGitHub
|
3425e1fcec
|
Merge pull request #53 from hhu-propra2/createGroup
Create group with UI
|
2020-03-10 14:58:28 +01:00 |
|
|
Lukas EttelandGitHub
|
6388dd9ea9
|
Merge pull request #38 from hhu-propra2/Eventrifinighandling
EventRifinigHandling
|
2020-03-09 16:46:16 +01:00 |
|
|
Lukas EttelandGitHub
|
1e0bd9c6ff
|
Merge pull request #33 from hhu-propra2/Services
Services
|
2020-03-06 16:56:13 +01:00 |
|
|
Lukas EttelandGitHub
|
b7d9b2d702
|
Merge pull request #30 from hhu-propra2/checkbugsFixReportLevel
Fixed the report-level of spotbugs
|
2020-03-05 16:51:44 +01:00 |
|
|
Lukas EttelandGitHub
|
ca28f041f5
|
Merge pull request #23 from hhu-propra2/keycloak
Keycloak
|
2020-03-05 13:07:59 +01:00 |
|
|
Lukas EttelandGitHub
|
baec7bdddd
|
Merge pull request #3 from hhu-propra2/t2-branch
T2 branch
|
2020-03-03 14:16:07 +01:00 |
|