|
|
482dde7960
|
"finish" service refactor + fix obvious bugs after refactor (everything should run pretty much)
|
2020-04-08 20:48:42 +02:00 |
|
|
|
fbe25deda1
|
renamings + rework group creation process + remove most wrapper types
|
2020-04-07 20:27:35 +02:00 |
|
|
|
63fa257ec9
|
some grammar corrections
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-04-05 21:37:48 +02:00 |
|
|
|
98607dcf49
|
remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-29 00:15:22 +01:00 |
|
|
|
cc64943663
|
only show link to admin
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:35:52 +01:00 |
|
|
|
853a5bcb03
|
fix forms to automatically generate csrf tokens
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 18:21:52 +01:00 |
|
|
|
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 |
|
|
|
551534d4ff
|
Merge branch 'master' into refactor-controller
# Conflicts:
# src/main/java/mops/gruppen2/controller/WebController.java
|
2020-03-25 13:03:22 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
341103b554
|
add scrollbar, fix template
|
2020-03-23 17:07:37 +01:00 |
|
|
|
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 |
|
|
|
62efdb784d
|
Merge pull request #120 from hhu-propra2/fix-add-csv
Fix add csv
|
2020-03-23 15:38:35 +01:00 |
|
|
|
7bae5e1184
|
add change_maximum size
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-23 14:57:33 +01:00 |
|
|
|
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 |
|
|
|
2a6cf0e529
|
added create link to createOrga
|
2020-03-23 13:27:11 +01:00 |
|
|
|
d8242022df
|
change color of buttons and badge to match the rest
|
2020-03-23 13:25:15 +01:00 |
|
|
|
de2c1ae245
|
Merge branch 'master' into design-fix
|
2020-03-23 12:57:57 +01:00 |
|
|
|
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 |
|
|
|
b6c013e254
|
fix GroupDelete
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 15:09:27 +01:00 |
|
|
|
71ea7eec40
|
add DeleteGoup function
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
|
2020-03-20 13:45:40 +01:00 |
|
|
|
acac3ca17c
|
Change badge colour
|
2020-03-20 02:59:41 +01:00 |
|
|
|
066d425d35
|
Add badge that displays parent group in detail site
|
2020-03-20 02:38:24 +01:00 |
|
|
|
ef044cbdf7
|
Merge remote-tracking branch 'origin/master' into csv-error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/User.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/createStudent.html
|
2020-03-19 17:01:32 +01:00 |
|
|
|
dc11536db3
|
Merge Erstellen and Veranstaltung into a single site
add two Erstellen sites, one for orga and one for student
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-19 16:50:52 +01:00 |
|
|
|
d2b5b44a0d
|
Merge remote-tracking branch 'origin/master' into max_userNumber
# Conflicts:
# src/main/resources/templates/editMembers.html
|
2020-03-19 15:55:59 +01:00 |
|
|
|
ca59309716
|
add display of actual and maximum users
|
2020-03-19 15:35:58 +01:00 |
|
|
|
087e0f7a13
|
Merge branch 'master' into ui
|
2020-03-19 14:32:01 +01:00 |
|
|
|
b6c5fcda65
|
fix styling, rename error page
|
2020-03-19 14:22:39 +01:00 |
|
|
|
2192751a01
|
fix rename errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:20:14 +01:00 |
|
|
|
a05ffe9e4c
|
Fix Checkstyle Errors :(
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:17:57 +01:00 |
|
|
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
|
c631f243a1
|
Refactor indentation in html files
|
2020-03-18 18:00:47 +01:00 |
|
|
|
b3107c98f1
|
Merge branch 'master' into edit-User
|
2020-03-18 16:43:33 +01:00 |
|
|
|
42721e06fc
|
Improve styling on several templates
|
2020-03-18 16:32:27 +01:00 |
|
|
|
dad86bb4b2
|
Merge remote-tracking branch 'origin/edit-User' into edit-User
# Conflicts:
# src/main/resources/templates/index.html
|
2020-03-18 16:18:14 +01:00 |
|
|
|
dac0b28efb
|
fix path redirecting
|
2020-03-18 16:16:27 +01:00 |
|
|
|
e0db7584ac
|
Improve styling on several templates
|
2020-03-18 16:00:11 +01:00 |
|
|
|
9aa7122779
|
Improve styling on several templates
|
2020-03-18 15:23:26 +01:00 |
|
|
|
75a4701bd0
|
fix table and functionality
|
2020-03-18 14:21:05 +01:00 |
|
|
|
5703ad4678
|
fix random error
|
2020-03-18 13:40:07 +01:00 |
|
|
|
af573f2353
|
Add list entry in html
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 13:36:22 +01:00 |
|
|
|
5f1cdca4ee
|
fix text overflow in groupdescription
|
2020-03-18 13:21:44 +01:00 |
|
|
|
a6667e4091
|
fix text overflow in groupdescription
|
2020-03-18 13:08:35 +01:00 |
|
|
|
0828c278dc
|
fix visibility recognition in detailsMember.html
|
2020-03-18 12:47:03 +01:00 |
|
|
|
b8936052cb
|
fix role recognition in detailsMember.html
|
2020-03-18 12:43:49 +01:00 |
|
