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

564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Christoph
6adbd06e73 Merge remote-tracking branch 'origin/master' 2020-03-24 14:15:22 +01:00
Christoph
c844f5d4fa some uuid improvements 2020-03-24 14:12:32 +01:00
tomvahl
491aeb1b66 Merge pull request #123 from hhu-propra2/ui-scrollbar 
Ui scrollbar
 2020-03-24 13:00:54 +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
Christoph
2eca5e1849 fix api etc 2020-03-23 17:01:01 +01:00
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 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
AndiBuls
8f50442c7b Merge pull request #122 from hhu-propra2/fix-lecture-parent-list 
Fix lecture parent list
 2020-03-23 16:26:04 +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
XXNitram
15054685f5 Fix getAllGroupWithVisibilityPublic method 
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:02 +01:00
Christoph
d562df8826 temporarily disable tests + rough change from groupid to uuid + remove invitelink old system 2020-03-23 16:17:17 +01:00
XXNitram
2737febdcd Fix filter in stream to find public lectures 
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:12:07 +01:00
XXNitram
430336ae9c Merge pull request #121 from hhu-propra2/fix_maxUser 
fix userMax
 2020-03-23 15:59:48 +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
9023fb72a7 fix nullpointer 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 15:56:15 +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
[Mahgs]
a03d3f5b69 link displayed in UI 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
 2020-03-23 15:08:39 +01:00
Christoph
fff8a8a730 Merge remote-tracking branch 'origin/master' 2020-03-23 15:00:56 +01:00
tomvahl
4b5634e45f Merge pull request #118 from hhu-propra2/optimize-db 
change schema.sql and adapt services + optimized search
 2020-03-23 15:00: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
Christoph
4cb8e4006b fix data.sql 2020-03-23 14:44:59 +01:00
Christoph
214fd4388e Revert "disable some tests" 
This reverts commit 56eee36c
 2020-03-23 14:42:17 +01:00