 Christoph
|
63fa257ec9
|
some grammar corrections
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-04-05 21:37:48 +02:00 |
|
|
Christoph
|
98607dcf49
|
remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:15:22 +01:00 |
|
|
[Mahgs]
|
d0114a5a58
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
# src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java
# src/main/java/mops/gruppen2/repository/EventRepository.java
# src/main/java/mops/gruppen2/service/EventService.java
# src/main/java/mops/gruppen2/service/UserService.java
|
2020-03-27 14:56:41 +01:00 |
|
|
Christoph
|
ef00c42f6f
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:45:11 +01:00 |
|
|
[Mahgs]
|
215a10c8fc
|
Merge remote-tracking branch 'origin/master' into JavaDocComments
|
2020-03-27 12:56:23 +01:00 |
|
|
Christoph
|
cc64943663
|
only show link to admin
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:35:52 +01:00 |
|
|
Christoph
|
b37f2349aa
|
secure invite link
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 20:53:59 +01:00 |
|
|
Christoph
|
5e5939aa42
|
Merge branch 'csrf' into invite-link-update
# Conflicts:
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/schema.sql
|
2020-03-26 18:28:34 +01:00 |
|
|
Christoph
|
853a5bcb03
|
fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 18:21:52 +01:00 |
|
|
[Mahgs]
|
bacf9be7cc
|
added link to controller
|
2020-03-26 17:14:49 +01:00 |
|
|
[Mahgs]
|
dbe3cc7f51
|
added show all to search.html
|
2020-03-26 16:37:28 +01:00 |
|
|
[Mahgs]
|
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 |
|
|
[Mahgs]
|
bbf4f0b6e5
|
changed Titel in error.html
|
2020-03-26 15:03:30 +01:00 |
|
|
Lukas Ettel
|
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 |
|
|
AndiBuls
|
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 |
|
|
Max OerterandGitHub
|
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 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
kasch309
|
a812de398e
|
add float for badges
|
2020-03-25 16:44:05 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
ChristophandGitHub
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
kasch309andGitHub
|
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 |
|
|
ChristophandGitHub
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 EttelandMax Oerter
|
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 |
|
|
|
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 |
|
|
tomvahlandxxnitram
|
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 |
|
|
tomvahlandGitHub
|
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 |
|
|
tomvahlandxxnitram
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +01:00 |
|