|
|
7be3db7e0d
|
Merge pull request #137 from hhu-propra2/group-list-ordering
Group list ordering
|
2020-03-25 16:10:11 +01:00 |
|
|
|
f09b498369
|
Merge remote-tracking branch 'origin/master' into group-list-ordering
# Conflicts:
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-25 16:09:46 +01:00 |
|
|
|
0ec805f3ae
|
Merge pull request #136 from hhu-propra2/killertester
Killertester
|
2020-03-25 16:07:12 +01:00 |
|
|
|
bc903e2543
|
fix tests
|
2020-03-25 16:04:56 +01:00 |
|
|
|
cff8b2c800
|
fix test
|
2020-03-25 15:59:20 +01:00 |
|
|
|
f0e49dfc55
|
slight changes
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 15:57:07 +01:00 |
|
|
|
6f9ab00ba1
|
fix UUID
|
2020-03-25 15:56:30 +01:00 |
|
|
|
48b8617cbb
|
Merge branch 'master' into killertester
|
2020-03-25 15:52:53 +01:00 |
|
|
|
ed4a9b5728
|
add badges in group lists
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-25 15:46:58 +01:00 |
|
|
|
dd7404553c
|
Merge pull request #135 from hhu-propra2/fix_createGroup
Fix create group
|
2020-03-25 14:50:41 +01:00 |
|
|
|
74038428df
|
Merge pull request #134 from hhu-propra2/fix-group-search-number-of-users
Fix group search number of users
|
2020-03-25 14:48:26 +01:00 |
|
|
|
d703b1f255
|
refactor Exceptions
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-25 14:47:46 +01:00 |
|
|
|
22ae8a81dc
|
partial fix search: max user anzahl display
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 14:46:02 +01:00 |
|
|
|
be37fcbd50
|
add Exceptions
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-25 14:40:59 +01:00 |
|
|
|
0e7f1d6865
|
Merge pull request #133 from hhu-propra2/fixNoAccessPrivateGroupExeption
removed html page for the exception
|
2020-03-25 14:08:47 +01:00 |
|
|
|
062a0505be
|
Deleted the html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-25 14:03:12 +01:00 |
|
|
|
473d58ae3b
|
partial fix search: group is displayed again after leaving
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 13:56:43 +01:00 |
|
|
|
ddfd21c6ef
|
add MaxMemberException
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-25 13:44:08 +01:00 |
|
|
|
8e914d8011
|
Refactoring
|
2020-03-25 13:36:47 +01:00 |
|
|
|
f4935b9a33
|
Merge remote-tracking branch 'origin/master' into fix-group-search-number-of-users
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/resources/templates/detailsMember.html
# src/main/resources/templates/search.html
|
2020-03-25 13:32:47 +01:00 |
|
|
|
cf685fb6ff
|
Merge pull request #128 from hhu-propra2/refactor-controller
Refactor controller
|
2020-03-25 13:08:01 +01:00 |
|
|
|
551534d4ff
|
Merge branch 'master' into refactor-controller
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
|
2020-03-25 13:03:22 +01:00 |
|
|
|
a4d603c580
|
Merge pull request #132 from hhu-propra2/swagger-doku
add swagger api doku
|
2020-03-25 10:44:41 +01:00 |
|
|
|
fb3a0a9dd7
|
Merge pull request #131 from hhu-propra2/readme-update
Update README.adoc
|
2020-03-25 10:32:04 +01:00 |
|
|
|
9bbede1201
|
add swagger api doku
|
2020-03-25 10:30:11 +01:00 |
|
|
|
386df44bde
|
Update README.adoc
|
2020-03-25 10:28:01 +01:00 |
|
|
|
a0d6243b5c
|
improved testing
|
2020-03-24 22:28:56 +01:00 |
|
|
|
7b47a78e99
|
Fix handing over of parent
|
2020-03-24 17:57:23 +01:00 |
|
|
|
cdb22828aa
|
remove checkGroup
|
2020-03-24 17:00:41 +01:00 |
|
|
|
9954f685f5
|
Fix Group Search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-24 16:59:45 +01:00 |
|
|
|
dffb927738
|
Merge pull request #130 from hhu-propra2/pageNotFound
added pageNotFoundException on not existing routs
|
2020-03-24 16:48:34 +01:00 |
|
|
|
79619a9476
|
added pageNotFoundException on not existing routs
|
2020-03-24 16:46:23 +01:00 |
|
|
|
2e6c6bc26b
|
Merge pull request #129 from hhu-propra2/showInviteLink
Show invite link
|
2020-03-24 16:36:02 +01:00 |
|
|
|
55396342bd
|
Merge branch 'master' into showInviteLink
|
2020-03-24 16:34:06 +01:00 |
|
|
|
2d3e935d64
|
merged with master and fixed some problems
|
2020-03-24 16:31:55 +01:00 |
|
|
|
8eda960e39
|
remove checkGroup
|
2020-03-24 16:30:05 +01:00 |
|
|
|
f0a1a9c7bb
|
refactor Controller
|
2020-03-24 16:16:18 +01:00 |
|
|
|
5916acc1c7
|
refactoring test
|
2020-03-24 16:07:18 +01:00 |
|
|
|
cefc122dfc
|
blah test merge fehler manno
|
2020-03-24 16:05:44 +01:00 |
|
|
|
d957326491
|
refactor Controller
|
2020-03-24 16:02:16 +01:00 |
|
|
|
f907c617a8
|
refactor WebController
|
2020-03-24 15:57:31 +01:00 |
|
|
|
439bd78b5c
|
fix alignment of title in detailsMember.html
|
2020-03-24 15:53:19 +01:00 |
|
|
|
efc3625215
|
Change active list entry of detailsNoMember.html
|
2020-03-24 15:44:34 +01:00 |
|
|
|
80ab65febb
|
update UserService
|
2020-03-24 15:38:06 +01:00 |
|
|
|
46aaf3658e
|
refactor createOrga Method in ControllerService
|
2020-03-24 15:36:52 +01:00 |
|
|
|
3b918308c6
|
Merge branch 'slight-chganges' into killertester
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-24 15:35:35 +01:00 |
|
|
|
89d7bb52c2
|
Merge pull request #126 from hhu-propra2/slight-chganges
decrease visibility of applyEvent methods + new testbuilder
|
2020-03-24 15:34:46 +01:00 |
|
|
|
6cd41d5e29
|
Merge remote-tracking branch 'origin/master' into showInviteLink
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/controller/MopsController.java
# src/main/java/mops/gruppen2/repository/InviteLinkRepository.java
# src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java
|
2020-03-24 15:32:56 +01:00 |
|
|
|
aabdc6c58f
|
Merge pull request #127 from hhu-propra2/ui-fixes
Ui fixes
|
2020-03-24 15:29:57 +01:00 |
|
|
|
5c9e1ae80e
|
fix button on error page
|
2020-03-24 15:26:01 +01:00 |
|
