|
|
25595c9380
|
merged with master
|
2020-03-26 15:11:12 +01:00 |
|
|
|
c62524aa8a
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-26 15:06:44 +01:00 |
|
|
|
bbf4f0b6e5
|
changed Titel in error.html
|
2020-03-26 15:03:30 +01:00 |
|
|
|
566c99565a
|
Merge pull request #143 from hhu-propra2/refactor-controllerService
Refactor createGroups in controller service
|
2020-03-26 14:55:00 +01:00 |
|
|
|
5394b5d47a
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:52:11 +01:00 |
|
|
|
7f1aab017e
|
Merge remote-tracking branch 'origin/master' into refactor-controllerService
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-26 14:45:43 +01:00 |
|
|
|
c88990a3ed
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:42:32 +01:00 |
|
|
|
4d0968b2d9
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-26 14:25:01 +01:00 |
|
|
|
e7df8a50e2
|
Merge pull request #142 from hhu-propra2/refactor-ValidationService
Refactor validation service
|
2020-03-26 14:19:46 +01:00 |
|
|
|
677ed4e37b
|
Add validation for setting a new userMaximum
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-26 14:14:45 +01:00 |
|
|
|
1cc52d7dce
|
Fix checkFields
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-26 14:14:06 +01:00 |
|
|
|
4f833c3c5f
|
Refactor WrongFileException
|
2020-03-26 14:12:53 +01:00 |
|
|
|
7b9af1320c
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 14:06:13 +01:00 |
|
|
|
91e745e939
|
Merge remote-tracking branch 'origin/master' into refactor-controllerService
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-26 13:57:10 +01:00 |
|
|
|
8c1eb876c5
|
Refactor of all createGroups complete
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
|
2020-03-26 13:50:22 +01:00 |
|
|
|
de0e8ee4fe
|
fixed some problems in WebController
|
2020-03-26 13:48:17 +01:00 |
|
|
|
2c6c844edd
|
delete InviteLinkDTO
|
2020-03-26 13:38:11 +01:00 |
|
|
|
eb59a70dd4
|
added javaDoc for UserService
|
2020-03-26 13:32:48 +01:00 |
|
|
|
3c05dbef75
|
added javaDoc for EventService and fix Todo
fix Todo in EventRepository
|
2020-03-26 13:28:23 +01:00 |
|
|
|
ae468f4afc
|
added javaDoc for GroupService
|
2020-03-26 13:14:35 +01:00 |
|
|
|
923dd713df
|
Merge remote-tracking branch 'origin/master' into refactor-ValidationService
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-26 13:04:17 +01:00 |
|
|
|
d1c8865580
|
html fix title alignment in detailsMember.html
Co-authored-by:
LukasEttel <lukas.ettie@yahoo.de>
tomvahl <tom-vahl@hotmail.com>
XXNitram <matti.55@hotmail.de>
[Mahgs] <maxoerter@gmx.de>
Christoph <tobi@urpost.de>
killerber4t <t.caliskan@live.de>
kasch309 <fr3sh3rpi55a@gmail.com>
|
2020-03-25 17:05:06 +01:00 |
|
|
|
b7bf21f4c3
|
Merge remote-tracking branch 'origin/refactor-controllerService' into refactor-ValidationService
|
2020-03-25 16:57:38 +01:00 |
|
|
|
f15d1f850d
|
Merge pull request #141 from hhu-propra2/prevent-private-lectures
prevent private lectures in frontend, still needs validation
|
2020-03-25 16:55:15 +01:00 |
|
|
|
eaf8631c9f
|
Merge pull request #139 from hhu-propra2/checkstyle
fixed checkstyle problems
|
2020-03-25 16:53:34 +01:00 |
|
|
|
57df0263d4
|
refactor ValidationService
|
2020-03-25 16:52:43 +01:00 |
|
|
|
b193327f9c
|
Merge remote-tracking branch 'origin/master' into checkstyle
|
2020-03-25 16:47:08 +01:00 |
|
|
|
0d3f59d710
|
Merge pull request #140 from hhu-propra2/uiBadges
add float for badges
|
2020-03-25 16:46:13 +01:00 |
|
|
|
a140cd22a0
|
Merge branch 'master' into refactor-controllerService
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-25 16:45:01 +01:00 |
|
|
|
02d81d4ee8
|
prevent private lectures in frontend, still needs validation
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-25 16:44:53 +01:00 |
|
|
|
a812de398e
|
add float for badges
|
2020-03-25 16:44:05 +01:00 |
|
|
|
81b93266e5
|
fixed checkstyle problems
|
2020-03-25 16:36:37 +01:00 |
|
|
|
95e3c38dd9
|
refactor createOrga
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
|
2020-03-25 16:30:22 +01:00 |
|
|
|
9045cace9c
|
Merge pull request #138 from hhu-propra2/add-ValidationService
Add validation service
|
2020-03-25 16:12:05 +01:00 |
|
|
|
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 |
|
|
|
c00ee2f235
|
Merge branch 'master' into add-ValidationService
|
2020-03-25 16:09:20 +01:00 |
|
|
|
dbfa260c4d
|
Refactor after merge with master
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-25 16:07:31 +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 |
|
|
|
2c70deeb7b
|
Merge remote-tracking branch 'origin/master' into add-ValidationService
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-25 15:51:10 +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 |
|
|
|
0c43050166
|
Refactor WebController and ValidationService
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-25 15:43:41 +01:00 |
|
|
|
5736de146d
|
refactor createGroup and createOrga
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
tomvahl <tom-vahl@hotmail.com>
|
2020-03-25 15:38:37 +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 |
|
