christoph/lecture-professional-software-development
1
Fork 0
Code Activity
901 Commits 2 Branches 0 Tags
master
Commit Graph

901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukas Ettel
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
Christoph
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
tomvahl
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
XXNitram
8e914d8011 Refactoring 2020-03-25 13:36:47 +01:00
XXNitram
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
Christoph
cf685fb6ff Merge pull request #128 from hhu-propra2/refactor-controller 
Refactor controller
 2020-03-25 13:08:01 +01:00
Christoph
551534d4ff Merge branch 'master' into refactor-controller 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
 2020-03-25 13:03:22 +01:00
Christoph
a4d603c580 Merge pull request #132 from hhu-propra2/swagger-doku 
add swagger api doku
 2020-03-25 10:44:41 +01:00
Talha Caliskan
fb3a0a9dd7 Merge pull request #131 from hhu-propra2/readme-update 
Update README.adoc
 2020-03-25 10:32:04 +01:00
Christoph
9bbede1201 add swagger api doku 2020-03-25 10:30:11 +01:00
Christoph
386df44bde Update README.adoc 2020-03-25 10:28:01 +01:00
Christoph
a0d6243b5c improved testing 2020-03-24 22:28:56 +01:00
XXNitram
7b47a78e99 Fix handing over of parent 2020-03-24 17:57:23 +01:00
Christoph
cdb22828aa remove checkGroup 2020-03-24 17:00:41 +01:00
XXNitram
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
tomvahl
dffb927738 Merge pull request #130 from hhu-propra2/pageNotFound 
added pageNotFoundException on not existing routs
 2020-03-24 16:48:34 +01:00
[Mahgs]
79619a9476 added pageNotFoundException on not existing routs 2020-03-24 16:46:23 +01:00
Max Oerter
2e6c6bc26b Merge pull request #129 from hhu-propra2/showInviteLink 
Show invite link
 2020-03-24 16:36:02 +01:00
kasch309
55396342bd Merge branch 'master' into showInviteLink 2020-03-24 16:34:06 +01:00
[Mahgs]
2d3e935d64 merged with master and fixed some problems 2020-03-24 16:31:55 +01:00
Christoph
8eda960e39 remove checkGroup 2020-03-24 16:30:05 +01:00
killerber4t
f0a1a9c7bb refactor Controller 2020-03-24 16:16:18 +01:00
tomvahl
5916acc1c7 refactoring test 2020-03-24 16:07:18 +01:00
Christoph
cefc122dfc blah test merge fehler manno 2020-03-24 16:05:44 +01:00
killerber4t
d957326491 refactor Controller 2020-03-24 16:02:16 +01:00
killerber4t
f907c617a8 refactor WebController 2020-03-24 15:57:31 +01:00
AndiBuls
439bd78b5c fix alignment of title in detailsMember.html 2020-03-24 15:53:19 +01:00
XXNitram
efc3625215 Change active list entry of detailsNoMember.html 2020-03-24 15:44:34 +01:00
killerber4t
80ab65febb update UserService 2020-03-24 15:38:06 +01:00
killerber4t
46aaf3658e refactor createOrga Method in ControllerService 2020-03-24 15:36:52 +01:00
Christoph
3b918308c6 Merge branch 'slight-chganges' into killertester 
# Conflicts:
#	src/test/java/mops/gruppen2/service/EventServiceTest.java
 2020-03-24 15:35:35 +01:00
Talha Caliskan
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
[Mahgs]
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
Christoph
aabdc6c58f Merge pull request #127 from hhu-propra2/ui-fixes 
Ui fixes
 2020-03-24 15:29:57 +01:00
kasch309
5c9e1ae80e fix button on error page 2020-03-24 15:26:01 +01:00
[Mahgs]
4b6257c9f0 set exceptions on join group 
added emoji to error.html <- wichtig

                                                          Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-24 15:24:24 +01:00
XXNitram
43d17fcf45 Merge pull request #125 from hhu-propra2/feature-change-title-description 
Feature change title description
 2020-03-24 15:23:53 +01:00
kasch309
ad5d1b3b31 fix each-loop on table 2020-03-24 15:22:52 +01:00
killerber4t
1146308752 rename file 2020-03-24 15:21:55 +01:00
Christoph
6ba4ba82de decrease visibility of applyEvent methods + new testbuilder 2020-03-24 15:20:35 +01:00
XXNitram
fe931a35c8 Fix pencil button styling 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 15:18:47 +01:00
XXNitram
c5de7fa46e Fix parameters 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 15:12:39 +01:00
XXNitram
18ab147703 Merge remote-tracking branch 'origin/master' into feature-change-title-description 2020-03-24 15:09:50 +01:00
[Mahgs]
89354eec26 link now correct displayed 2020-03-24 15:09:44 +01:00
XXNitram
ff22f0c1e7 Change button 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 14:55:17 +01:00
[Mahgs]
60837d8cf3 Merge remote-tracking branch 'origin/master' into showInviteLink 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-24 14:51:33 +01:00
Max Oerter
e61e9d3d25 Merge pull request #124 from hhu-propra2/invite-link-group-id-change 
Invite link group id change
 2020-03-24 14:48:29 +01:00
Christoph
5c6d94753b some uuid improvements 2020-03-24 14:37:23 +01:00
XXNitram
59bea22d8e Add changeMetadata feature 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Max Oerter <mahgs@users.noreply.github.com>
Co-Authored-By: Christoph <churl@users.noreply.github.com>
 2020-03-24 14:34:52 +01:00
Christoph
2f8a044c53 Merge branch 'master' into invite-link-group-id-change 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-24 14:28:30 +01:00