|
|
08717611d5
|
Rename SerializationService to JsonService
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:46:14 +01:00 |
|
|
|
e1a630ae1a
|
adapt tests
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:45:33 +01:00 |
|
|
|
79de4a8540
|
renaming
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:40:36 +01:00 |
|
|
|
e4d8fb05cb
|
removed unneccessary fields, decreased field visibility
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:32:05 +01:00 |
|
|
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
|
01c0cac2a2
|
Merge pull request #100 from hhu-propra2/import-csv-in-overview
Import csv in editMembers overview
|
2020-03-18 19:00:00 +01:00 |
|
|
|
b1460abe48
|
Exception rework: clearer message + origin
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 18:49:40 +01:00 |
|
|
|
a1ee6a18cd
|
Refactor Gruppen2Controller and change redirect in addUsersFromCsv method
|
2020-03-18 18:03:02 +01:00 |
|
|
|
40d1c898e8
|
Refactor ControllerService
|
2020-03-18 18:02:11 +01:00 |
|
|
|
c631f243a1
|
Refactor indentation in html files
|
2020-03-18 18:00:47 +01:00 |
|
|
|
4b6e8eae39
|
Merge remote-tracking branch 'origin/master' into import-csv-in-overview
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/resources/templates/editMembers.html
|
2020-03-18 17:36:06 +01:00 |
|
|
|
2d8472bd4a
|
Merge remote-tracking branch 'origin/master' into error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/resources/templates/errorRenameLater.html
|
2020-03-18 17:20:31 +01:00 |
|
|
|
f4513e4f99
|
Merge pull request #99 from hhu-propra2/edit-User
Edit user
|
2020-03-18 17:12:00 +01:00 |
|
|
|
d2c1de7c9f
|
fix for merge
|
2020-03-18 17:01:33 +01:00 |
|
|
|
1fbfd49781
|
show file thats choosen to load up
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-18 16:55:07 +01:00 |
|
|
|
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 |
|
|
|
90124a7c15
|
Fix file input alignment
|
2020-03-18 16:40:40 +01:00 |
|
|
|
4b88742776
|
add deleteUser button and reconfigure the according method
|
2020-03-18 16:36:54 +01:00 |
|
|
|
42721e06fc
|
Improve styling on several templates
|
2020-03-18 16:32:27 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0ade9319fb
|
Merge pull request #98 from hhu-propra2/fix_search
Fix search
|
2020-03-18 16:06:36 +01:00 |
|
|
|
62397a24ef
|
update search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 16:03:34 +01:00 |
|
|
|
e0db7584ac
|
Improve styling on several templates
|
2020-03-18 16:00:11 +01:00 |
|
|
|
22172b5406
|
cleanup of the search function
|
2020-03-18 15:25:37 +01:00 |
|
|
|
9aa7122779
|
Improve styling on several templates
|
2020-03-18 15:23:26 +01:00 |
|
|
|
2b1d6507e6
|
fix-search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 15:17:48 +01:00 |
|
|
|
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 |
|
|
|
522d1369ec
|
fix search
remove your Group from search
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
|
2020-03-18 15:09:14 +01:00 |
|
|
|
7e52935b77
|
Add check for empty csv file
and set required parameter to false
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
|
2020-03-18 15:05:09 +01:00 |
|
|
|
ecd6154580
|
Merge pull request #96 from hhu-propra2/feature-orga-csv
Feature orga csv
|
2020-03-18 14:46:46 +01:00 |
|
|
|
6929b1ead4
|
Add Service Annotation
|
2020-03-18 14:43:26 +01:00 |
|
|
|
f408391f4c
|
Refactor Gruppen2Controller
|
2020-03-18 14:40:39 +01:00 |
|
|
|
ba4a531337
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
|
2020-03-18 14:38:50 +01:00 |
|
|
|
f292700c78
|
Merge remote-tracking branch 'origin/master' into feature-orga-csv
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-18 14:27:54 +01:00 |
|
|
|
9541188350
|
Merge pull request #95 from hhu-propra2/updateCheckGroup
Update check group
|
2020-03-18 14:25:36 +01:00 |
|
|
|
9934249cb5
|
Merge pull request #94 from hhu-propra2/defaultRoute
Default route
|
2020-03-18 14:24:48 +01:00 |
|
|
|
3b09d2a3a2
|
Merge remote-tracking branch 'origin/edit-User' into edit-User
# Conflicts:
# src/main/resources/templates/editMembers.html
|
2020-03-18 14:23:27 +01:00 |
|
|
|
69141705ab
|
fixed tests
|
2020-03-18 14:22:23 +01:00 |
|
|
|
b89b47ec81
|
set redirection to index instead of previous page
|
2020-03-18 14:21:39 +01:00 |
|
|
|
75a4701bd0
|
fix table and functionality
|
2020-03-18 14:21:05 +01:00 |
|
|
|
45679c7d2a
|
Update .gitignore
|
2020-03-18 14:20:32 +01:00 |
|
|
|
838bff1d9f
|
Update GroupType in createGroup
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:19:00 +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 |
|
|
|
56f82203cd
|
fix entering group youre already part of
|
2020-03-18 14:11:52 +01:00 |
|
|
|
b236e3bb9d
|
changed checkGroup Method to a Query
|
2020-03-18 14:09:30 +01:00 |
|
|
|
523d7d2ad9
|
added a default route
|
2020-03-18 13:52:48 +01:00 |
|
|
|
e2326d5f23
|
added a default route
|
2020-03-18 13:46:51 +01:00 |
|
