 ChristophandGitHub
|
13187ccf55
|
Merge pull request #151 from hhu-propra2/fixxxxx
fix
|
2020-03-27 14:55:49 +01:00 |
|
|
Christoph
|
3f192c9b81
|
fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:53:31 +01:00 |
|
|
ChristophandGitHub
|
e387206205
|
Merge pull request #149 from hhu-propra2/invite-link-update
Invite link update
|
2020-03-27 14:40:39 +01:00 |
|
|
Christoph
|
63d9b76d40
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:33:01 +01:00 |
|
|
Christoph
|
9ccb7c77a2
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 14:04:32 +01:00 |
|
|
Christoph
|
ef00c42f6f
|
fix invite
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:45:11 +01:00 |
|
|
Christoph
|
858efd57d3
|
fixfixfix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:17:09 +01:00 |
|
|
Christoph
|
8c29d04740
|
fix schema
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 13:15:05 +01:00 |
|
|
Christoph
|
56a81ce66f
|
caching
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-27 12:57:47 +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
|
02e7bcbcc4
|
fix api
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 21:19:59 +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 |
|
|
Christoph
|
832a03c82f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# documentation/day02_progress.adoc
# documentation/day03_progress.adoc
# documentation/day04_progress.adoc
# documentation/day05_progress.adoc
# documentation/day06_progress.adoc
# documentation/day07_progress.adoc
# documentation/day08_progress.adoc
# documentation/day09_progress.adoc
# documentation/day10_progress.adoc
# documentation/day11_progress.adoc
# documentation/day12_progress.adoc
# documentation/day13_progress.adoc
# documentation/day14_progress.adoc
# documentation/day15_progress.adoc
# documentation/day16_progress.adoc
# documentation/day17_progress.adoc
# mysql/db/entrypoint/schema.sql
|
2020-03-26 17:22:46 +01:00 |
|
|
Christoph
|
b50783cd8c
|
merge fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:21:28 +01:00 |
|
|
Christoph
|
82e9611d47
|
merge fix
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:20:58 +01:00 |
|
|
Christoph
|
68a9ddeecc
|
create links
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:10:15 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
9302bc68b5
|
queries + inviteservice
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 17:04:12 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
f581169afc
|
queries
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:45:54 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
d336c10802
|
schema fix + repo + dto
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:41:18 +01:00 |
|
|
ChristophandGitHub
|
598ec3ea6e
|
Merge pull request #147 from hhu-propra2/serchAll
Serch all
|
2020-03-26 16:40:16 +01:00 |
|
|
Christoph
|
666bab0c03
|
entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:35:31 +01:00 |
|
|
Christoph
|
63c924dbb9
|
add mysql schema entrypoint
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:30:29 +01:00 |
|
|
Christoph
|
083044bbbb
|
update dockerfile: pull wait-for-it from github
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:28:28 +01:00 |
|
|
Christoph
|
33e3d9d3f5
|
docker profiles, docker compose, mysql entrypoint, security
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-26 16:06:40 +01:00 |
|
|
ChristophandGitHub
|
eaf8631c9f
|
Merge pull request #139 from hhu-propra2/checkstyle
fixed checkstyle problems
|
2020-03-25 16:53:34 +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 |
|
|
ChristophandGitHub
|
9045cace9c
|
Merge pull request #138 from hhu-propra2/add-ValidationService
Add validation service
|
2020-03-25 16:12:05 +01:00 |
|
|
ChristophandGitHub
|
7be3db7e0d
|
Merge pull request #137 from hhu-propra2/group-list-ordering
Group list ordering
|
2020-03-25 16:10:11 +01:00 |
|
|
Christoph
|
f09b498369
|
Merge remote-tracking branch 'origin/master' into group-list-ordering
# Conflicts:
# src/main/java/mops/gruppen2/service/GroupService.java
|
2020-03-25 16:09:46 +01:00 |
|
|
ChristophandGitHub
|
0ec805f3ae
|
Merge pull request #136 from hhu-propra2/killertester
Killertester
|
2020-03-25 16:07:12 +01:00 |
|
|
|
f0e49dfc55
|
slight changes
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 15:57:07 +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 |
|
|
ChristophandXXNitram
|
473d58ae3b
|
partial fix search: group is displayed again after leaving
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
|
2020-03-25 13:56:43 +01:00 |
|
|
ChristophandGitHub
|
cf685fb6ff
|
Merge pull request #128 from hhu-propra2/refactor-controller
Refactor controller
|
2020-03-25 13:08:01 +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 |
|
|
ChristophandGitHub
|
a4d603c580
|
Merge pull request #132 from hhu-propra2/swagger-doku
add swagger api doku
|
2020-03-25 10:44:41 +01:00 |
|
|
ChristophandGitHub
|
9bbede1201
|
add swagger api doku
|
2020-03-25 10:30:11 +01:00 |
|
|
ChristophandGitHub
|
386df44bde
|
Update README.adoc
|
2020-03-25 10:28:01 +01:00 |
|
|
Christoph
|
a0d6243b5c
|
improved testing
|
2020-03-24 22:28:56 +01:00 |
|
|
Christoph
|
cdb22828aa
|
remove checkGroup
|
2020-03-24 17:00:41 +01:00 |
|
|
Christoph
|
8eda960e39
|
remove checkGroup
|
2020-03-24 16:30:05 +01:00 |
|
|
Christoph
|
cefc122dfc
|
blah test merge fehler manno
|
2020-03-24 16:05:44 +01:00 |
|
|
Christoph
|
3b918308c6
|
Merge branch 'slight-chganges' into killertester
# Conflicts:
# src/test/java/mops/gruppen2/service/EventServiceTest.java
|
2020-03-24 15:35:35 +01:00 |
|
|
ChristophandGitHub
|
aabdc6c58f
|
Merge pull request #127 from hhu-propra2/ui-fixes
Ui fixes
|
2020-03-24 15:29:57 +01:00 |
|
|
Christoph
|
6ba4ba82de
|
decrease visibility of applyEvent methods + new testbuilder
|
2020-03-24 15:20:35 +01:00 |
|
|
Christoph
|
5c6d94753b
|
some uuid improvements
|
2020-03-24 14:37:23 +01:00 |
|
|
Christoph
|
2f8a044c53
|
Merge branch 'master' into invite-link-group-id-change
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/service/ControllerService.java
|
2020-03-24 14:28:30 +01:00 |
|
|
Christoph
|
6adbd06e73
|
Merge remote-tracking branch 'origin/master'
|
2020-03-24 14:15:22 +01:00 |
|
|
Christoph
|
c844f5d4fa
|
some uuid improvements
|
2020-03-24 14:12:32 +01:00 |
|
|
Christoph
|
2eca5e1849
|
fix api etc
|
2020-03-23 17:01:01 +01:00 |
|
|
Christoph
|
d562df8826
|
temporarily disable tests + rough change from groupid to uuid + remove invitelink old system
|
2020-03-23 16:17:17 +01:00 |
|
|
Christoph
|
fff8a8a730
|
Merge remote-tracking branch 'origin/master'
|
2020-03-23 15:00:56 +01:00 |
|
|
Christoph
|
4cb8e4006b
|
fix data.sql
|
2020-03-23 14:44:59 +01:00 |
|
|
Christoph
|
214fd4388e
|
Revert "disable some tests"
This reverts commit 56eee36c
|
2020-03-23 14:42:17 +01:00 |
|
|
Christoph
|
56eee36c51
|
disable some tests
|
2020-03-23 14:41:44 +01:00 |
|
|
Christoph
|
9e588532f5
|
disable some tests
|
2020-03-23 14:41:10 +01:00 |
|
|
Christoph
|
ec88a6bcad
|
change schema.sql and adapt services + optimized search
|
2020-03-23 14:10:24 +01:00 |
|
|
Christoph
|
8d0c3987d2
|
prepare search optimization
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-20 16:00:07 +01:00 |
|
|
Christoph
|
2192751a01
|
fix rename errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:20:14 +01:00 |
|
|
Christoph
|
fdd9d44aac
|
fix merge errors
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-19 00:00:33 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
1c5139da8c
|
Merge refactor into error-handling + fix merge errors
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:45:07 +01:00 |
|
|
Christoph
|
849c94481c
|
Merge branch 'refactoring' into error-handling
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
# src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
# src/main/java/mops/gruppen2/domain/Group.java
# src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
# src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
# src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
# src/main/java/mops/gruppen2/domain/event/Event.java
# src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
# src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
# src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
# src/main/java/mops/gruppen2/domain/exception/EventException.java
# src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
# src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
# src/main/java/mops/gruppen2/domain/exception/NoValueException.java
# src/main/java/mops/gruppen2/service/ControllerService.java
# src/main/java/mops/gruppen2/service/GroupService.java
# src/main/java/mops/gruppen2/service/UserService.java
# src/main/resources/templates/errorRenameLater.html
|
2020-03-18 23:40:39 +01:00 |
|
|
Christoph
|
e9bab1bf3f
|
Intellij Code Cleaunp
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:25:54 +01:00 |
|
|
Christoph
|
a05ffe9e4c
|
Fix Checkstyle Errors :(
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 23:17:57 +01:00 |
|
|
Christoph
|
08717611d5
|
Rename SerializationService to JsonService
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:46:14 +01:00 |
|
|
Christoph
|
e1a630ae1a
|
adapt tests
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:45:33 +01:00 |
|
|
Christoph
|
79de4a8540
|
renaming
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:40:36 +01:00 |
|
|
Christoph
|
e4d8fb05cb
|
removed unneccessary fields, decreased field visibility
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 21:32:05 +01:00 |
|
|
Christoph
|
2ba913f2c8
|
Formatting
Co-authored-by: Christoph <tobi@urpost.de>
|
2020-03-18 20:18:03 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
Christoph
|
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 |
|
|
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 |
|
|
ChristophandGitHub
|
9541188350
|
Merge pull request #95 from hhu-propra2/updateCheckGroup
Update check group
|
2020-03-18 14:25:36 +01:00 |
|
|
ChristophandGitHub
|
9934249cb5
|
Merge pull request #94 from hhu-propra2/defaultRoute
Default route
|
2020-03-18 14:24:48 +01:00 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
Christophand[Mahgs] <maxoerter@gmx.de>
|
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 |
|
|
ChristophandGitHub
|
7c2d5ecb28
|
Merge pull request #81 from hhu-propra2/keycloakRestApi
Keycloak rest api
|
2020-03-16 16:28:35 +01:00 |
|
|
ChristophandGitHub
|
523b7a8f16
|
Merge pull request #80 from hhu-propra2/details-templates
Details templates
|
2020-03-16 14:55:15 +01:00 |
|
|
Christoph
|
2c3531657d
|
csv proof of concept
|
2020-03-16 14:09:30 +01:00 |
|
|
Christoph
|
9f464fe859
|
init csv support
|
2020-03-16 13:56:05 +01:00 |
|
|
ChristophandGitHub
|
9e1a04f723
|
Merge pull request #75 from hhu-propra2/docker-profile
add docker spring profile, mysql adapter + docker compose
|
2020-03-16 12:36:03 +01:00 |
|
|
Christoph
|
f6a3b431a9
|
add docker spring profile, mysql adapter + docker compose
|
2020-03-15 15:19:02 +01:00 |
|
|
Christoph
|
e48c1a78bb
|
update readme
|
2020-03-13 16:10:16 +01:00 |
|
|
Christoph
|
f64bb0f578
|
refactor projection method
|
2020-03-12 14:37:32 +01:00 |
|
|
Christoph
|
31b9456892
|
update eventbuilder
|
2020-03-12 14:08:14 +01:00 |
|
|
Christoph
|
07bbbec7e5
|
Merge branch 'master' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts.
|
2020-03-12 13:57:48 +01:00 |
|
|
Christoph
|
b7b4485d03
|
add missing enums
|
2020-03-11 15:34:52 +01:00 |
|
|
Christoph
|
e8770066f8
|
change create group event + new group fields
|
2020-03-11 15:27:56 +01:00 |
|
|
Christoph
|
07462fae36
|
Merge remote-tracking branch 'origin/GroupLogicProjection' into GroupLogicProjection
|
2020-03-10 16:29:38 +01:00 |
|
|
Christoph
|
2f4af867e8
|
added deserialization tests
|
2020-03-10 16:29:28 +01:00 |
|
|
Christoph
|
d229b2089a
|
add eventdto -> event conversion
|
2020-03-10 16:01:27 +01:00 |
|
|
Christoph
|
66a6b9a137
|
added deserialization tests
|
2020-03-10 15:59:09 +01:00 |
|
|
Christoph
|
42e7cdf673
|
added deserialization tests
|
2020-03-10 14:10:18 +01:00 |
|
|
Christoph
|
73e7737b8c
|
restore things lost in merge ffs
|
2020-03-10 13:34:19 +01:00 |
|