|
|
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 |
|
|
|
69141705ab
|
fixed tests
|
2020-03-18 14:22:23 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
eabbcc7e04
|
Add jackson dependency
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:35:41 +01:00 |
|
|
|
e9ee776047
|
Merge pull request #93 from hhu-propra2/group-invite-links
added Group invite links
|
2020-03-18 13:21:34 +01:00 |
|
|
|
b431361eec
|
merged with master
|
2020-03-18 13:19:19 +01:00 |
|
|
|
722cd80831
|
Merge remote-tracking branch 'origin/master' into group-invite-links
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/repository/EventRepository.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-18 13:18:34 +01:00 |
|
|
|
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 |
|
|
|
aa67bd2e88
|
Add missing service
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 16:55:32 +01:00 |
|
|
|
6e067d1b47
|
Fix InviteLink DB Schema + Implement Frontend InviteLink Handling
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 16:16:58 +01:00 |
|
|
|
e412c051f7
|
Merge pull request #91 from hhu-propra2/quickFix
Quick fix on master
|
2020-03-17 16:15:26 +01:00 |
|
|
|
49c38b583c
|
Quick fix on master
|
2020-03-17 16:13:29 +01:00 |
|
|
|
90a07e7b2a
|
Merge pull request #90 from hhu-propra2/eventExeptionHandling
Implementation of old EventExeptions
|
2020-03-17 16:06:54 +01:00 |
|
|
|
991bcf2aaa
|
Implementation of old EventExeptions
|
2020-03-17 15:57:26 +01:00 |
|
|
|
f7678073db
|
Merge pull request #89 from hhu-propra2/Join_Group
add Join Group
|
2020-03-17 15:25:54 +01:00 |
|
|
|
bd9e1bb28e
|
add Join Group
Mitgearbeitet hat:
Karla
Andi
|
2020-03-17 15:11:40 +01:00 |
|
|
|
bafdea881a
|
Merge pull request #88 from hhu-propra2/delete-User
Delete user
|
2020-03-17 15:00:34 +01:00 |
|
|
|
c052ec6ae6
|
refactor code
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:58:02 +01:00 |
|
|
|
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 |
|
|
|
aa843f1d8e
|
fix html
|
2020-03-17 14:46:20 +01:00 |
|
|
|
921a7c1b3e
|
Merge pull request #87 from hhu-propra2/delete-User
add leaving group
|
2020-03-17 14:41:02 +01:00 |
|
|
|
ea0810174a
|
Merge branch 'master' into delete-User
|
2020-03-17 14:39:02 +01:00 |
|
|
|
61e007e4d8
|
add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:36:55 +01:00 |
|
|
|
a28f9a215c
|
Merge pull request #86 from hhu-propra2/details-ui-fix
Details ui fix
|
2020-03-17 14:02:21 +01:00 |
|
|
|
4bcf931246
|
spacing still wrong
|
2020-03-17 13:58:34 +01:00 |
|
|
|
41833b2a07
|
fixed spacing for details
|
2020-03-17 13:56:03 +01:00 |
|
|
|
1acfcc449f
|
Merge pull request #85 from hhu-propra2/ui-improvements
fix styling, add missing attributes
|
2020-03-17 13:50:02 +01:00 |
|
|
|
bddffd48c1
|
Merge pull request #84 from hhu-propra2/change-to-polymorphie
Change to polymorphie
|
2020-03-17 13:49:39 +01:00 |
|
|
|
bae8805972
|
fix styling, add missing attributes
|
2020-03-17 13:47:09 +01:00 |
|
|
|
0467d3c6a6
|
removed outdated test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 13:46:19 +01:00 |
|
|
|
906585ce9a
|
added InviteLinkRepository
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 13:42:35 +01:00 |
|
|
|
e045dc54ee
|
Add InviteLinkDTO + add dto folder
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 13:33:02 +01:00 |
|
|
|
db11178ccd
|
Add db table for invite links
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-17 13:25:37 +01:00 |
|
|
|
f05b92994f
|
Merge pull request #83 from hhu-propra2/design-change
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:19:23 +01:00 |
|
|
|
e2dcee44af
|
added deleted button in search.html and changed design of index.html
|
2020-03-17 13:15:21 +01:00 |
|
|
|
325c5d84f9
|
Merge branch 'master' into change-to-polymorphie
|
2020-03-17 13:05:20 +01:00 |
|
|
|
cbf69e387b
|
fix search funktion
|
2020-03-17 12:35:06 +01:00 |
|
|
|
8387b58e35
|
change createGroup Methode in ControllerService
|
2020-03-17 11:09:27 +01:00 |
|
