|
|
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 |
|
|
|
3b918308c6
|
Merge branch 'slight-chganges' into killertester
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-24 15:35:35 +01:00 |
|
|
|
6ba4ba82de
|
decrease visibility of applyEvent methods + new testbuilder
|
2020-03-24 15:20:35 +01:00 |
|
|
|
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 |
|
|
|
5c6d94753b
|
some uuid improvements
|
2020-03-24 14:37:23 +01:00 |
|
|
|
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 |
|
|
|
fe12831dab
|
refactor Tests and delete unnecessary Test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-24 14:22:19 +01:00 |
|
|
|
6adbd06e73
|
Merge remote-tracking branch 'origin/master'
|
2020-03-24 14:15:22 +01:00 |
|
|
|
c844f5d4fa
|
some uuid improvements
|
2020-03-24 14:12:32 +01:00 |
|
|
|
a307476b07
|
fix JsonService implementation
|
2020-03-24 13:43:36 +01:00 |
|
|
|
365e927845
|
Merge remote-tracking branch 'origin/killertester' into killertester
|
2020-03-24 13:29:31 +01:00 |
|
|
|
f39f22bbf2
|
refactoring test
|
2020-03-24 13:28:44 +01:00 |
|
|
|
64fe9c387d
|
Merge branch 'master' into killertester
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-24 13:08:58 +01:00 |
|
|
|
fd3a118b04
|
refactoring test
|
2020-03-24 13:07:55 +01:00 |
|
|
|
491aeb1b66
|
Merge pull request #123 from hhu-propra2/ui-scrollbar
Ui scrollbar
|
2020-03-24 13:00:54 +01:00 |
|
|
|
1b469ca363
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 17:08:46 +01:00 |
|
|
|
72a71b1ada
|
fix colors for uniformity
|
2020-03-23 17:08:20 +01:00 |
|
|
|
341103b554
|
add scrollbar, fix template
|
2020-03-23 17:07:37 +01:00 |
|
|
|
2eca5e1849
|
fix api etc
|
2020-03-23 17:01:01 +01:00 |
|
|
|
90e0a1ff52
|
Add more architecture tests
|
2020-03-23 16:45:57 +01:00 |
|
|
|
8f50442c7b
|
Merge pull request #122 from hhu-propra2/fix-lecture-parent-list
Fix lecture parent list
|
2020-03-23 16:26:04 +01:00 |
|
|
|
c7445d8dee
|
fix 1 Test
|
2020-03-23 16:24:31 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d562df8826
|
temporarily disable tests + rough change from groupid to uuid + remove invitelink old system
|
2020-03-23 16:17:17 +01:00 |
|
|
|
f60214eb64
|
fix Test-setUp
|
2020-03-23 16:12:56 +01:00 |
|
|
|
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 |
|
|
|
22e9379b37
|
add EventServiceTest tests
|
2020-03-23 16:08:21 +01:00 |
|
|
|
430336ae9c
|
Merge pull request #121 from hhu-propra2/fix_maxUser
fix userMax
|
2020-03-23 15:59:48 +01:00 |
|
|
|
27403f2712
|
Update editMembers.html
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 15:57:25 +01:00 |
|
|
|
9023fb72a7
|
fix nullpointer
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 15:56:15 +01:00 |
|
|
|
6aea99e903
|
fix userMax
|
2020-03-23 15:47:59 +01:00 |
|
|
|
62efdb784d
|
Merge pull request #120 from hhu-propra2/fix-add-csv
Fix add csv
|
2020-03-23 15:38:35 +01:00 |
|
|
|
cfb13a385c
|
fix th:name
|
2020-03-23 15:34:31 +01:00 |
|
|
|
feb1223ea8
|
fix styling
|
2020-03-23 15:27:08 +01:00 |
|
|
|
fff8a8a730
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 15:00:56 +01:00 |
|
|
|
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 |
|
|
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +01:00 |
|
|
|
4cb8e4006b
|
fix data.sql
|
2020-03-23 14:44:59 +01:00 |
|
|
|
214fd4388e
|
Revert "disable some tests"
This reverts commit 56eee36c
|
2020-03-23 14:42:17 +01:00 |
|
|
|
56eee36c51
|
disable some tests
|
2020-03-23 14:41:44 +01:00 |
|
|
|
9e588532f5
|
disable some tests
|
2020-03-23 14:41:10 +01:00 |
|
|
|
ec88a6bcad
|
change schema.sql and adapt services + optimized search
|
2020-03-23 14:10:24 +01:00 |
|
|
|
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 |
|
|
|
d8242022df
|
change color of buttons and badge to match the rest
|
2020-03-23 13:25:15 +01:00 |
|
|
|
cfeaf7a5d4
|
Merge pull request #116 from hhu-propra2/fixSomeErrors
Fix some errors
|
2020-03-23 13:23:46 +01:00 |
|
|
|
7e021075eb
|
Merge remote-tracking branch 'origin/master' into fixSomeErrors
|
2020-03-23 13:16:06 +01:00 |
|
|
|
06bd77b9e6
|
merge
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 13:14:22 +01:00 |
|
|
|
37e0f7f8f7
|
Merge pull request #115 from hhu-propra2/design-fix
Design fix
|
2020-03-23 13:06:32 +01:00 |
|
