14075 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	64f159e82f	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-06-27 12:54:15 +02:00
Wolfgang Huß	f247e6bd7b	Try to filter only for events with location	2023-06-27 12:53:47 +02:00
Wolfgang Huß	f06369ad7c	Setup displaying events on map – first step	2023-06-27 12:52:18 +02:00
Ulf Gebhardt	1cadf80a43	fixed fullstack tests	2023-06-22 16:48:51 +02:00
Ulf Gebhardt	0a40357160	fix lint	2023-06-22 16:23:34 +02:00
Ulf Gebhardt	844c870642	Merge branch 'master' into eslint-backend	2023-06-22 15:15:44 +02:00
Ulf Gebhardt	c9547ef662	lint fixes	2023-06-22 15:13:56 +02:00
Ulf Gebhardt	fa19e89174	fix test - describes cant be asnyc	2023-06-22 15:13:48 +02:00
Moriz Wahl	b3fec7bf6f	Merge branch 'master' into fix-subscriptions	2023-06-21 19:28:27 +02:00
Moriz Wahl	2f2b50249f	Merge pull request #6472 from Ocelot-Social-Community/fix-reports-seed ... fix(backend): seed reports	2023-06-21 19:20:30 +02:00
Moriz Wahl	d3b3e50278	Merge branch 'master' into fix-reports-seed	2023-06-21 17:59:31 +02:00
Moriz Wahl	ed9fefbf76	Update backend/src/db/seed.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-06-21 17:59:20 +02:00
Ulf Gebhardt	5be2fe28b0	Merge branch 'master' into eslint-backend	2023-06-21 17:11:57 +02:00
Ulf Gebhardt	700fe68f35	Merge pull request #6470 from Ocelot-Social-Community/remove-activity-pub ... refactor(backend): remove activity pub	2023-06-21 17:07:12 +02:00
Ulf Gebhardt	373e915a14	make content optional parameter	2023-06-21 16:47:08 +02:00
Ulf Gebhardt	ef7bc9283e	js -> ts rename	2023-06-21 16:43:29 +02:00
Ulf Gebhardt	aaa033c6a3	lint fixes	2023-06-21 16:43:18 +02:00
Moriz Wahl	a498110ee4	Merge branch 'master' into fix-reports-seed	2023-06-21 16:41:59 +02:00
Ulf Gebhardt	e6c9cf47a7	removed include and excludes from tsconfig.json	2023-06-21 16:39:57 +02:00
Ulf Gebhardt	57704d8095	lint rules and packages	2023-06-21 16:39:17 +02:00
Ulf Gebhardt	0e1dea6002	Merge branch 'master' into remove-activity-pub	2023-06-21 16:26:24 +02:00
Wolfgang Huß	087bf390d9	Merge pull request #6441 from Ocelot-Social-Community/6439-fix-terms-and-condition+data-privacy-links-on-registration ... fix(webapp): change registration `terms and conditions`, `data privacy` links to use `page-params-link`	2023-06-21 16:16:56 +02:00
Moriz Wahl	badaac8527	activate clean database again	2023-06-21 14:33:41 +02:00
Moriz Wahl	c9135d321d	fix notification added subscription	2023-06-21 14:31:16 +02:00
Moriz Wahl	07d10c8e4c	fix(backend): notifications	2023-06-21 14:29:56 +02:00
Wolfgang Huß	acbaf301bb	Merge branch 'master' into 6439-fix-terms-and-condition+data-privacy-links-on-registration	2023-06-21 14:09:32 +02:00
Moriz Wahl	3451a16ab4	fix(backend): seed reports	2023-06-21 11:14:59 +02:00
Moriz Wahl	9e4b2d18c4	Merge pull request #6471 from Ocelot-Social-Community/message-properties ... feat(backend): message properties	2023-06-21 09:56:30 +02:00
Ulf Gebhardt	4d91b3f5b0	Merge branch 'master' into remove-activity-pub	2023-06-21 06:55:22 +02:00
Moriz Wahl	02ffdda69d	Merge branch 'master' into message-properties	2023-06-20 20:24:28 +02:00
Moriz Wahl	6904668a22	Merge pull request #6451 from Ocelot-Social-Community/room-properties ... feat(backend): room properties	2023-06-20 20:24:09 +02:00
Ulf Gebhardt	42ea5a3025	increase coverage reequirement to 70	2023-06-20 19:26:08 +02:00
Moriz Wahl	6a3ec44f4d	feat(backend): message properties	2023-06-20 19:19:54 +02:00
Ulf Gebhardt	ec4eff86f7	remove activity pub middleware	2023-06-20 18:47:50 +02:00
Ulf Gebhardt	6adffd7c6b	remove well-known properly	2023-06-20 18:44:30 +02:00
Ulf Gebhardt	c063682560	remove activity pub related stuff - since its unused	2023-06-20 18:39:43 +02:00
Moriz Wahl	45602119ca	Merge branch 'master' into room-properties	2023-06-20 16:47:53 +02:00
Moriz Wahl	c66e958760	Merge pull request #6469 from Ocelot-Social-Community/fix-create-message ... fix(backend): create message mutation	2023-06-20 16:47:36 +02:00
Moriz Wahl	9062e1d248	Merge branch 'master' into room-properties	2023-06-20 16:40:19 +02:00
Moriz Wahl	bbfaba83ee	fix(backend): create message mutation	2023-06-20 16:05:19 +02:00
Wolfgang Huß	56816f0d98	Simplify 'forceTargetBlank' in call of 'page-params-link'	2023-06-20 14:22:26 +02:00
Wolfgang Huß	853f6f8fad	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6439-fix-terms-and-condition+data-privacy-links-on-registration	2023-06-20 14:14:40 +02:00
Wolfgang Huß	29a05efadb	Fix linting	2023-06-20 13:56:52 +02:00
ogerly	932ad7037f	add apollo messages query	2023-06-20 13:09:12 +02:00
ogerly	01ce770b2d	Merge branch 'master' into 6398-Create-a-vue-advanced-chat-component	2023-06-20 12:47:33 +02:00
Moriz Wahl	5567ae475a	Merge pull request #6450 from Ocelot-Social-Community/messages ... feat(backend): messages	2023-06-20 12:45:06 +02:00
ogerly	a28be72e84	Chat rooms query ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-06-20 12:31:50 +02:00
Ulf Gebhardt	af6f682cff	Merge branch 'master' into 6398-Create-a-vue-advanced-chat-component	2023-06-20 11:47:50 +02:00
Ulf Gebhardt	db413bcbd4	downgrade node version again as it seems to cause problems	2023-06-20 11:44:23 +02:00
Ulf Gebhardt	1ea221ce0c	booleans must be in quotes aswell	2023-06-20 11:44:23 +02:00