 Talha CaliskanandGitHub
|
b3107c98f1
|
Merge branch 'master' into edit-User
|
2020-03-18 16:43:33 +01:00 |
|
|
|
4450a091de
|
Add addUsersFromCsv in editMembers Overview
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:42:06 +01:00 |
|
|
XXNitram
|
90124a7c15
|
Fix file input alignment
|
2020-03-18 16:40:40 +01:00 |
|
|
killerber4t
|
4b88742776
|
add deleteUser button and reconfigure the according method
|
2020-03-18 16:36:54 +01:00 |
|
|
kasch309
|
42721e06fc
|
Improve styling on several templates
|
2020-03-18 16:32:27 +01:00 |
|
|
ChristophandMahgs
|
df7803f83d
|
add error handling (frontend) + exception changes
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: Mahgs <maxoerter@gmx.de>
|
2020-03-18 16:27:24 +01:00 |
|
|
kasch309
|
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 |
|
|
killerber4t
|
dac0b28efb
|
fix path redirecting
|
2020-03-18 16:16:27 +01:00 |
|
|
kasch309
|
e0db7584ac
|
Improve styling on several templates
|
2020-03-18 16:00:11 +01:00 |
|
|
kasch309
|
9aa7122779
|
Improve styling on several templates
|
2020-03-18 15:23:26 +01:00 |
|
|
XXNitram
|
6f664326c3
|
Merge remote-tracking branch 'origin/edit-User' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 15:15:06 +01:00 |
|
|
kasch309
|
b89b47ec81
|
set redirection to index instead of previous page
|
2020-03-18 14:21:39 +01:00 |
|
|
kasch309
|
75a4701bd0
|
fix table and functionality
|
2020-03-18 14:21:05 +01:00 |
|
|
|
0db03f2ab5
|
Add createLecture feature
also add private checkbox again and delete the uploadCsv methods in APIController
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 14:13:58 +01:00 |
|
|
killerber4t
|
5703ad4678
|
fix random error
|
2020-03-18 13:40:07 +01:00 |
|
|
|
051196f766
|
Add CSV methods and createLecture.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:57 +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 |
|
|
killerber4t
|
5f1cdca4ee
|
fix text overflow in groupdescription
|
2020-03-18 13:21:44 +01:00 |
|
|
killerber4t
|
a6667e4091
|
fix text overflow in groupdescription
|
2020-03-18 13:08:35 +01:00 |
|
|
killerber4t
|
0828c278dc
|
fix visibility recognition in detailsMember.html
|
2020-03-18 12:47:03 +01:00 |
|
|
killerber4t
|
b8936052cb
|
fix role recognition in detailsMember.html
|
2020-03-18 12:43:49 +01:00 |
|
|
XXNitram
|
4b1627a993
|
Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/APIController.java
# src/main/resources/templates/create.html
|
2020-03-18 03:23:22 +01:00 |
|
|
|
179062eed9
|
Add createLecture for orga only
Co-Authored-By: andibuls <andibuls@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-17 17:07:30 +01:00 |
|
|
killerber4t
|
61dc1eb928
|
Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User
|
2020-03-17 16:57:25 +01:00 |
|
|
killerber4t
|
9491f83cca
|
fix roles on detailsMember.html
|
2020-03-17 16:57:13 +01:00 |
|
|
kasch309
|
06eb174c42
|
add table column
|
2020-03-17 16:56:38 +01:00 |
|
|
killerber4t
|
a67d8fa993
|
Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User
|
2020-03-17 16:44:09 +01:00 |
|
|
killerber4t
|
47ee171070
|
fix roles on detailsMember.html
|
2020-03-17 16:42:31 +01:00 |
|
|
kasch309
|
e9199857b7
|
change table class
|
2020-03-17 16:35:00 +01:00 |
|
|
kasch309
|
b0186eee66
|
fix edit members button (add margin)
|
2020-03-17 16:32:04 +01:00 |
|
|
kasch309
|
b648920c42
|
fix template
|
2020-03-17 16:29:55 +01:00 |
|
|
killerber4t
|
3036f76b37
|
Merge remote-tracking branch 'origin/master' into edit-User
|
2020-03-17 16:16:44 +01:00 |
|
|
kasch309
|
d2f71e6390
|
delete table column
|
2020-03-17 16:11:24 +01:00 |
|
|
kasch309
|
9b6a168fb6
|
Add rough template for editing embers of a group
|
2020-03-17 15:55:51 +01:00 |
|
|
killerber4tandxxnitram
|
a868ea86b4
|
add edit-members to controller
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 15:31:53 +01:00 |
|
|
tomvahl
|
bd9e1bb28e
|
add Join Group
Mitgearbeitet hat:
Karla
Andi
|
2020-03-17 15:11:40 +01:00 |
|
|
killerber4t
|
2738b6a35f
|
Merge branch 'delete-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into delete-User
|
2020-03-17 14:47:02 +01:00 |
|
|
killerber4t
|
aa843f1d8e
|
fix html
|
2020-03-17 14:46:20 +01:00 |
|
|
Talha CaliskanandGitHub
|
ea0810174a
|
Merge branch 'master' into delete-User
|
2020-03-17 14:39:02 +01:00 |
|
|
killerber4tandxxnitram
|
61e007e4d8
|
add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:36:55 +01:00 |
|
|
AndiBuls
|
4bcf931246
|
spacing still wrong
|
2020-03-17 13:58:34 +01:00 |
|
|
AndiBuls
|
41833b2a07
|
fixed spacing for details
|
2020-03-17 13:56:03 +01:00 |
|
|
kasch309
|
bae8805972
|
fix styling, add missing attributes
|
2020-03-17 13:47:09 +01:00 |
|
|
AndiBuls
|
e2dcee44af
|
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:15:21 +01:00 |
|
|
kasch309andGitHub
|
7c3942c10d
|
Merge branch 'master' into details-templates
|
2020-03-16 14:53:19 +01:00 |
|
|
kasch309
|
f4cee7ee82
|
Add template for error page, that redirects the user to the previous page (rename later)
|
2020-03-16 14:51:13 +01:00 |
|
|
Christoph
|
2c3531657d
|
csv proof of concept
|
2020-03-16 14:09:30 +01:00 |
|
|
kasch309
|
54d5028693
|
Add template for detailsNoMember.html, that displays the details when you search a page.
Add connection to the controller
|
2020-03-16 13:31:51 +01:00 |
|
|
AndiBuls
|
eecfc0351f
|
made ui look more consistent
|
2020-03-16 13:31:51 +01:00 |
|
|
killerber4t
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|