1
Commit Graph

763 Commits

Author SHA1 Message Date
7f05e0fb10 greater projectionservice refactoring 2020-04-06 17:21:09 +02:00
5da796d66d slight repository refactor 2020-04-06 14:55:34 +02:00
9e158ad6d0 badpayloadexception + more reordering ugh 2020-04-06 01:06:22 +02:00
3d66f58af8 new eventbuilderservice + projectionservice + searchservice, some renamings etc 2020-04-06 00:07:46 +02:00
5a5d1586ed Merge pull request #1 from hhu-propra2/master
update
2020-04-05 22:10:50 +02:00
ddc4e9885e Merge pull request #167 from hhu-propra2/dev
Dev
2020-04-05 22:01:33 +02:00
4b06d3b2e1 spotbugs
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:58:06 +02:00
ee00569415 Merge pull request #166 from hhu-propra2/DOC-update-readme
Doc update readme
2020-04-05 21:48:11 +02:00
74e345c522 status expected?
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:47:12 +02:00
ee050c2485 Merge remote-tracking branch 'origin/DOC-update-readme' into DOC-update-readme 2020-04-05 21:45:37 +02:00
6daf351852 Merge branch 'dev' into DOC-update-readme 2020-04-05 21:45:10 +02:00
c6918a1276 Merge branch 'dev' into DOC-update-readme 2020-04-05 21:43:11 +02:00
ab9c621739 update readme
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:42:04 +02:00
4a3aa5bc41 Merge pull request #163 from hhu-propra2/FEATURE-memberlist-names
show user givennames in private groups
2020-04-05 21:40:19 +02:00
63fa257ec9 some grammar corrections
Co-authored-by: Christoph <tobi@urpost.de>
2020-04-05 21:37:48 +02:00
c592d39c41 Merge pull request #162 from hhu-propra2/TEST-api-tests
new api tests + fixes
2020-03-30 11:17:46 +02:00
b730dee4b1 fix uuidMock() after merge
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-30 11:15:40 +02:00
935b1c7a60 Merge branch 'dev' into TEST-api-tests 2020-03-30 11:08:47 +02:00
5bc695b01b Merge pull request #161 from hhu-propra2/TEST-event-tests
Test event tests
2020-03-30 11:06:36 +02:00
9b68403934 Merge branch 'dev' into TEST-event-tests 2020-03-30 10:47:07 +02:00
67ed42b31f Merge pull request #159 from hhu-propra2/REFACTOR-checkstyle-java-warnings
Refactor checkstyle java warnings
2020-03-30 10:20:47 +02:00
02faf526c3 Merge pull request #160 from hhu-propra2/master
merge ci to refactor
2020-03-30 09:52:49 +02:00
95da5e6cd8 Merge pull request #157 from hhu-propra2/CI-include-dev-branch
include new dev-branch in actions
2020-03-30 00:52:31 +02:00
3d0da633b5 change controller of csv method
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 17:49:33 +02:00
0c8e841c8e new api tests + fixes
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 17:24:25 +02:00
58f0cfbe33 new individual event-tests + removed old comments + removed doubled exception
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 15:47:25 +02:00
33ccf8ddcb init individual event-tests
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 14:13:26 +02:00
36ebb6b8b6 rename package
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 14:12:43 +02:00
eee7b4367a two mapping renames
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 13:18:54 +02:00
100f5649c0 invite mappings to search controller + slight invite changes
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:45:32 +01:00
4cd0808fdc split main controller into multiple
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:32:32 +01:00
40e86d6d55 use static method
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:17:40 +01:00
98607dcf49 remove simple to fix warnings
Co-authored-by: Christoph <tobi@urpost.de>
2020-03-29 00:15:22 +01:00
c5d48a561b include new dev-branch in actions 2020-03-28 19:41:02 +01:00
eb11751663 Merge pull request #156 from hhu-propra2/JavaDocComments
Java doc comments
2020-03-27 16:45:42 +01:00
f2c2a11470 Merge remote-tracking branch 'origin/master' into JavaDocComments 2020-03-27 16:40:53 +01:00
5ee92d5cd6 fix 2020-03-27 16:40:30 +01:00
890abe73d0 Merge pull request #155 from hhu-propra2/add-arc
Add arc
2020-03-27 16:39:59 +01:00
f3f5f072b9 Merge remote-tracking branch 'origin/master' into JavaDocComments
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
2020-03-27 16:39:40 +01:00
4c064ae307 delete wrong file 2020-03-27 16:37:55 +01:00
0963970eac add arc42 full file 2020-03-27 16:36:04 +01:00
77c11bfec0 Merge pull request #154 from hhu-propra2/controllerAndControllerServiceRefactor
Controller and controller service refactor
2020-03-27 16:34:46 +01:00
b79326f6d8 Merge remote-tracking branch 'origin/master' 2020-03-27 16:34:22 +01:00
b1069b5049 Fix tests and checkstyle
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
2020-03-27 16:30:59 +01:00
82ae081f95 Fix tests
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
2020-03-27 16:17:45 +01:00
9a0035ba1a added javaDoc Comments to ControllerService 2020-03-27 15:58:39 +01:00
59e9ff4d4d Merge with master
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
2020-03-27 15:55:23 +01:00
bf122457c2 Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor
# Conflicts:
#	src/main/java/mops/gruppen2/service/ValidationService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java
2020-03-27 15:33:45 +01:00
3650561123 Merge remote-tracking branch 'origin/master' into JavaDocComments
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
2020-03-27 15:29:50 +01:00
2e3f705544 Fix merge confilcts
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
2020-03-27 15:26:32 +01:00