14075 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mahula	5b73dc8e58	fix typo	2023-07-11 12:33:54 +02:00
Wolfgang Huß	f217c1d63c	Replace properties.about by properties.description on map	2023-07-11 12:22:07 +02:00
Wolfgang Huß	11afa1f6d5	Simplify the map legend	2023-07-11 12:14:21 +02:00
Ulf Gebhardt	dd4e6bf2dc	fix open chat functionality after relog co-authored-by: Ogerly <https://github.com/ogerly>	2023-07-11 12:13:46 +02:00
mahula	bb53ee70da	Merge branch 'master' into 6375-refactor-cypress-migrate-from-cypress-file-upload-to-selectfile	2023-07-11 11:56:40 +02:00
Markus	c99bbe3708	fixed linting	2023-07-11 11:41:52 +02:00
Markus	8551cbd896	[design] adjusted single room chat window style/layout	2023-07-11 11:37:33 +02:00
Wolfgang Huß	6c32eb918d	Add markers for events to map	2023-07-11 11:33:24 +02:00
Markus	91b2961562	[feature] adjusted avatar style for chat if no image is available	2023-07-11 11:31:00 +02:00
mahula	242619d21b	remove unnecessary cypress code from step definitions	2023-07-11 11:19:47 +02:00
Ulf Gebhardt	073adbe48c	do not allow to create room with self	2023-07-11 11:19:01 +02:00
mahula	f44dda4127	fix file path	2023-07-11 10:30:20 +02:00
Markus	fade2eed21	[feature] added close button to the single room chat window	2023-07-11 10:23:44 +02:00
Markus	33f5746220	merged master	2023-07-11 10:19:17 +02:00
mahula	d42cac30c8	add file content to file selection in test step	2023-07-11 09:59:38 +02:00
Markus	2cff87e1cf	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-11 09:56:50 +02:00
Wolfgang Huß	7fa970ad1a	Add event to map legend	2023-07-11 09:43:11 +02:00
mahula	4efb6463a0	adapt feature step to selectFile	2023-07-11 08:42:08 +02:00
mahula	c1a4ba12da	adapt feature step to selectFile	2023-07-10 21:58:53 +02:00
Ulf Gebhardt	1ee2dc70bb	Merge pull request #6524 from Ocelot-Social-Community/frontend-messages ... feat(webapp): chat message capability	2023-07-10 20:56:59 +02:00
mahula	73f6bc6421	remove package cypress-file-upload from e2e testing	2023-07-10 20:41:21 +02:00
Ulf Gebhardt	3134c7311c	Merge branch 'master' into frontend-messages	2023-07-10 19:44:27 +02:00
mahula	31da4c597b	fix webapp github workflow conditions	2023-07-10 19:14:20 +02:00
mahula	728fd79579	set cypress test retries to 0	2023-07-10 18:42:06 +02:00
mahula	753e60fef1	Merge branch 'master' into refactor-webapp-workflow	2023-07-10 18:22:21 +02:00
mahula	5afd0f6bb4	Merge pull request #6368 from Ocelot-Social-Community/dependabot/npm_and_yarn/faker-js/faker-8.0.2 ... chore(backend): bump @faker-js/faker from 5.1.0 to 8.0.2	2023-07-10 18:20:17 +02:00
mahula	54711d3676	Merge branch 'master' into dependabot/npm_and_yarn/faker-js/faker-8.0.2	2023-07-10 17:12:32 +02:00
Ulf Gebhardt	cb8db68b5b	user mapgetters instead of addressing the store directly	2023-07-10 17:11:14 +02:00
mahula	3d32f39088	fix webapp github workflow conditions	2023-07-10 17:07:47 +02:00
Ulf Gebhardt	0888be0f70	Merge branch 'master' into frontend-messages	2023-07-10 17:04:22 +02:00
mahula	5379d615bb	Merge pull request #6509 from Ocelot-Social-Community/dependabot/npm_and_yarn/cypress-12.17.0 ... chore(other): bump cypress from 12.14.0 to 12.17.0	2023-07-10 16:58:21 +02:00
Ulf Gebhardt	0ad59d9412	lint fix	2023-07-10 16:27:36 +02:00
mahula	97d883b845	set new placeholder texts for venue and city inputs	2023-07-10 16:25:53 +02:00
Ulf Gebhardt	aecc24e374	chat message capability	2023-07-10 16:21:39 +02:00
mahula	0d6a7daba4	Merge branch 'master' into dependabot/npm_and_yarn/cypress-12.17.0	2023-07-10 16:15:50 +02:00
Markus	5af8aa52cf	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-10 15:55:23 +02:00
Ulf Gebhardt	a965cef459	Merge pull request #6519 from Ocelot-Social-Community/frontend-rooms ... feat(webapp): chat rooms	2023-07-10 15:26:22 +02:00
Ulf Gebhardt	88e2091804	fix comments	2023-07-10 13:37:42 +02:00
Ulf Gebhardt	1b0f512415	fix seed to not use promise all where easily refactored	2023-07-10 12:58:39 +02:00
mahula	98076064d5	fix typo in webapp locale	2023-07-10 12:38:49 +02:00
Ulf Gebhardt	8859aa56a4	lint fixes	2023-07-10 12:00:11 +02:00
Ulf Gebhardt	5f2cfdeab4	backend room hacks	2023-07-10 11:53:20 +02:00
Ulf Gebhardt	c2c96ee96c	frontend rooms query, singleRoom gets an userid now, not a boolean	2023-07-10 11:53:00 +02:00
Wolfgang Huß	f89f821dc4	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-07-10 11:20:25 +02:00
Markus	67768c008f	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-10 10:56:59 +02:00
Markus	13b2968c28	added more base design to chat component & lint	2023-07-10 10:49:48 +02:00
Ulf Gebhardt	abdcdba355	Merge pull request #6516 from Ocelot-Social-Community/fix-branded-build3 ... fix(other): fix branded build - rename files to js for the webapp	2023-07-09 12:17:43 +02:00
Ulf Gebhardt	2caeededef	Merge branch 'master' into fix-branded-build3	2023-07-09 10:53:42 +02:00
Ulf Gebhardt	b90576689f	update stage.ocelot.social reference	2023-07-09 10:43:12 +02:00
Ulf Gebhardt	22b5e8f6f8	rename ts files to js for webapp	2023-07-09 10:41:40 +02:00