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

161 Commits

Author SHA1 Message Date
Christoph
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
Christoph
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
Christoph
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
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
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
551534d4ff Merge branch 'master' into refactor-controller 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
 2020-03-25 13:03:22 +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
kasch309
55396342bd Merge branch 'master' into showInviteLink 2020-03-24 16:34:06 +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
[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
kasch309
ad5d1b3b31 fix each-loop on table 2020-03-24 15:22:52 +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
[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
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
kasch309
1b469ca363 Merge remote-tracking branch 'origin/master' 2020-03-23 17:08:46 +01:00
kasch309
72a71b1ada fix colors for uniformity 2020-03-23 17:08:20 +01:00
kasch309
341103b554 add scrollbar, fix template 2020-03-23 17:07:37 +01:00
Lukas Ettel
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
XXNitram
c37535ea05 Display infinite members message in group search details site 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-23 16:22:57 +01:00
tomvahl
27403f2712 Update editMembers.html 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 15:57:25 +01:00
tomvahl
6aea99e903 fix userMax 2020-03-23 15:47:59 +01:00
tomvahl
62efdb784d Merge pull request #120 from hhu-propra2/fix-add-csv 
Fix add csv
 2020-03-23 15:38:35 +01:00
kasch309
cfb13a385c fix th:name 2020-03-23 15:34:31 +01:00
kasch309
feb1223ea8 fix styling 2020-03-23 15:27:08 +01:00
tomvahl
7bae5e1184 add change_maximum size 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 14:57:33 +01:00
[Mahgs]
892c734265 link displayed in UI 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
 2020-03-23 14:14:24 +01:00
kasch309
25df317be4 Merge pull request #117 from hhu-propra2/ui 
change color of buttons and badge to match the rest
 2020-03-23 13:28:54 +01:00
[Mahgs]
2a6cf0e529 added create link to createOrga 2020-03-23 13:27:11 +01:00
kasch309
d8242022df change color of buttons and badge to match the rest 2020-03-23 13:25:15 +01:00
Lukas Ettel
7e021075eb Merge remote-tracking branch 'origin/master' into fixSomeErrors 2020-03-23 13:16:06 +01:00
Lukas Ettel
676245d44d Merge remote-tracking branch 'origin/master' into fixSomeErrors 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
 2020-03-23 13:05:32 +01:00
AndiBuls
de2c1ae245 Merge branch 'master' into design-fix 2020-03-23 12:57:57 +01:00
AndiBuls
d3608e5043 changed template design; title and description now scales with window size 
mitgemacht haben Martin, Lukas, Talha
 2020-03-20 16:42:12 +01:00
Lukas Ettel
a13bdbf6b5 Fixed unauthoriced acsess to group-details 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-20 16:33:56 +01:00
tomvahl
755f76ef58 Update createOrga.html 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 16:06:11 +01:00
tomvahl
b6c013e254 fix GroupDelete 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 15:09:27 +01:00
tomvahl
73f6798c2c if group empty gets delete 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 14:00:41 +01:00
tomvahl
71ea7eec40 add DeleteGoup function 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 13:45:40 +01:00
XXNitram
acac3ca17c Change badge colour 2020-03-20 02:59:41 +01:00
XXNitram
5b106d7746 Add function that collapses the drop-down list if the lecture checkbox is checked 2020-03-20 02:39:59 +01:00
XXNitram
066d425d35 Add badge that displays parent group in detail site 2020-03-20 02:38:24 +01:00
XXNitram
820782c2ce Add feature to link a group to a lecture 2020-03-20 02:36:51 +01:00
Lukas Ettel
d43e62bb1d Merge pull request #110 from hhu-propra2/merge-create-sites 
Merge create sites
 2020-03-19 18:42:02 +01:00