16408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	610d279465	fixable lints	2023-07-06 13:08:41 +02:00
Ulf Gebhardt	5c7bd46139	fix english	2023-07-06 13:02:38 +02:00
Ulf Gebhardt	9dffbfbdad	remove new line	2023-07-06 12:53:55 +02:00
Ulf Gebhardt	ccfaddd729	remove console log in store	2023-07-06 12:51:34 +02:00
Ulf Gebhardt	e463de20d4	fix red console	2023-07-06 12:51:25 +02:00
Ulf Gebhardt	e6b99c3d7c	make chat not red	2023-07-06 12:36:08 +02:00
Ulf Gebhardt	2630862f3f	clean chat page	2023-07-06 12:32:27 +02:00
Ulf Gebhardt	38d555bdf8	rename chat-modul to chat	2023-07-06 12:30:50 +02:00
ogerly	216f1093c9	Merge branch 'create-a-component-chat-scaffholding' of https://github.com/Ocelot-Social-Community/Ocelot-Social into create-a-component-chat-scaffholding	2023-07-06 12:26:40 +02:00
ogerly	572e175879	step 2	2023-07-06 12:26:28 +02:00
Ulf Gebhardt	f5c2fe7770	Merge branch 'master' into eslint-backend	2023-07-06 12:06:15 +02:00
Ulf Gebhardt	bd847b1f84	fixed red console	2023-07-06 12:05:47 +02:00
ogerly	e93e330fad	remove card element	2023-07-06 11:55:09 +02:00
ogerly	0c68d65127	Merge branch 'create-a-component-chat-scaffholding' of https://github.com/Ocelot-Social-Community/Ocelot-Social into create-a-component-chat-scaffholding	2023-07-06 11:50:24 +02:00
ogerly	ae3532ef8b	remove text	2023-07-06 11:50:12 +02:00
Alexander Friedland	d073a2a948	Merge branch 'master' into create-a-component-chat-scaffholding	2023-07-06 11:36:01 +02:00
ogerly	1cb486cc8c	chat-modul structur, add store state roomID	2023-07-06 11:30:55 +02:00
ogerly	9b4a71bd96	add store chat-modul, showChatModul	2023-07-06 07:17:38 +02:00
ogerly	9a690d6051	single chat modul in default template	2023-07-05 17:17:54 +02:00
ogerly	c8af90f0a6	add chat base-button in header menu	2023-07-05 15:51:55 +02:00
ogerly	34d38b117e	remove client chat page, make chat components	2023-07-05 13:48:30 +02:00
Markus	708c769a3b	added chat code as plugin for client rendering	2023-07-04 21:42:14 +02:00
Moriz Wahl	29bbe25020	Merge pull request #6477 from Ocelot-Social-Community/fix-subscriptions ... fix(backend): subscriptions b2.7.0-460	2023-07-03 11:45:09 +02:00
dependabot[bot]	b6ba0fc283	Bump @faker-js/faker from 5.1.0 to 8.0.2 ... Bumps [@faker-js/faker](https://github.com/faker-js/faker) from 5.1.0 to 8.0.2. - [Release notes](https://github.com/faker-js/faker/releases) - [Changelog](https://github.com/faker-js/faker/blob/next/CHANGELOG.md) - [Commits](https://github.com/faker-js/faker/compare/v5.1.0...v8.0.2) --- updated-dependencies: - dependency-name: "@faker-js/faker" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-01 01:37:31 +00:00
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
dependabot[bot]	f33908bcfc	Bump dotenv from 8.6.0 to 16.3.1 ... Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.6.0 to 16.3.1. - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/compare/v8.6.0...v16.3.1) --- updated-dependencies: - dependency-name: dotenv dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-24 01:57:01 +00: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 b2.7.0-459	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 b2.7.0-458	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` b2.7.0-457	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