14119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	3a229672d2	update stage.ocelot.social reference	2023-07-07 23:09:19 +02:00
Ulf Gebhardt	4de840f2ea	fix build paths	2023-07-07 23:09:02 +02:00
Hannes Heine	1f548487cd	Merge pull request #6507 from Ocelot-Social-Community/fix-branded-build ... fix(backend): fix branded build	2023-07-07 21:30:42 +02:00
Ulf Gebhardt	4fb884c9eb	fix copy script	2023-07-07 11:56:28 +02:00
Ulf Gebhardt	597a6f9015	start node in build/src	2023-07-07 11:56:00 +02:00
Ulf Gebhardt	e058d4009a	fix docker file	2023-07-07 11:55:42 +02:00
Alexander Friedland	f568d7676d	Merge pull request #6503 from Ocelot-Social-Community/create-a-component-chat-scaffholding ... feat(webapp): create a component chat scaffholding	2023-07-07 11:08:10 +02:00
Ulf Gebhardt	50312c9106	lint	2023-07-07 08:44:35 +02:00
Ulf Gebhardt	ee3cac603c	Merge branch 'master' into create-a-component-chat-scaffholding	2023-07-07 08:41:46 +02:00
Ulf Gebhardt	8da1b71866	Merge pull request #6505 from Ocelot-Social-Community/fix-create-post-notifications ... fix(webapp): fix create post & notifications	2023-07-07 08:41:29 +02:00
Ulf Gebhardt	163f8cc32c	fix for e2e test - use different css class for chat notification menu	2023-07-07 08:24:21 +02:00
Ulf Gebhardt	b0a9c19143	Merge branch 'master' into fix-create-post-notifications	2023-07-07 07:48:22 +02:00
Ulf Gebhardt	e7613d1a07	Merge pull request #6478 from Ocelot-Social-Community/eslint-backend ... feat(backend): typescript eslint backend	2023-07-07 07:48:09 +02:00
Ulf Gebhardt	6c6b5ec937	Merge branch 'fix-create-post-notifications' into create-a-component-chat-scaffholding	2023-07-07 07:28:45 +02:00
Ulf Gebhardt	d42bc2ea3c	fix notifications in case no previous result is present	2023-07-07 07:19:52 +02:00
Ulf Gebhardt	e9121705a4	fix createPost query to not fail due to apollo cache	2023-07-07 07:19:35 +02:00
Ulf Gebhardt	dfbc436665	lint	2023-07-06 14:04:20 +02:00
Ulf Gebhardt	76c08bfa77	fix locales	2023-07-06 13:50:53 +02:00
Ulf Gebhardt	5220ffe9af	fix default layout spec	2023-07-06 13:50:10 +02:00
Ulf Gebhardt	27de68e136	lint	2023-07-06 13:09:55 +02:00
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	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
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