14109 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Markus	86bd4bad5b	fixed intends for token style file	2023-07-12 09:38:31 +02:00
mahula	875dfcefa5	reset e2e test workflow	2023-07-12 09:28:51 +02:00
mahula	f454ea1159	reset e2e test workflow	2023-07-12 09:10:00 +02:00
mahula	4c565e92c5	correct spec pattern path in cypress config	2023-07-12 09:05:41 +02:00
mahula	a93500488a	update github e2e workflow file to reporting related changes	2023-07-12 08:35:39 +02:00
Ulf Gebhardt	d0fe6273b4	Merge branch 'master' into refactor-seed	2023-07-12 00:32:57 +02:00
mahula	44ac68fb35	update github e2e workflow file to reporting related changes	2023-07-11 21:18:07 +02:00
mahula	d65f87c1a8	update github e2e workflow file to reporting related changes	2023-07-11 20:57:14 +02:00
mahula	a0b6c67707	update github e2e workflow file to reporting related changes	2023-07-11 20:41:38 +02:00
mahula	8d3dd01724	add htlm report creation script	2023-07-11 20:40:18 +02:00
mahula	4da06ce800	update cypress cucumber preprosessor config in package.json	2023-07-11 20:16:34 +02:00
mahula	8dd7156195	remove unnecessary code from cypress config	2023-07-11 20:13:27 +02:00
mahula	f7480bd381	add reporter packages to e2e-test directory	2023-07-11 20:06:20 +02:00
mahula	eeaa166f73	Merge pull request #6527 from Ocelot-Social-Community/disable-cypress-retries ... refactor(other): disable cypress test retries b2.7.0-475	2023-07-11 17:26:27 +02:00
mahula	7add9f4a4f	Merge branch 'master' into disable-cypress-retries	2023-07-11 16:56:40 +02:00
mahula	4a0427e02b	Merge pull request #6525 from Ocelot-Social-Community/6501-featurefrontend-event-creation-page ... feat(webapp): event creation page -better placeholder texts for venue and city inputs b2.7.0-474	2023-07-11 16:56:21 +02:00
mahula	e2da08c0ff	Merge branch 'master' into 6501-featurefrontend-event-creation-page	2023-07-11 15:59:33 +02:00
mahula	0154f7bcd5	Merge pull request #6526 from Ocelot-Social-Community/refactor-webapp-workflow ... refactor(other): refine webapp github workflow conditions b2.7.0-473	2023-07-11 15:58:57 +02:00
Ulf Gebhardt	a6af78f777	reduce coverage to 67%	2023-07-11 15:44:16 +02:00
Ulf Gebhardt	6255d9b11b	Merge branch 'master' into refactor-seed	2023-07-11 15:42:44 +02:00
mahula	8d962c738a	Merge branch 'master' into refactor-webapp-workflow	2023-07-11 15:34:45 +02:00
mahula	a7260e8714	update cypress run scripts in package.json	2023-07-11 15:02:51 +02:00
mahula	82999d377d	disable waiting for actionability at post creation image dropzone	2023-07-11 15:00:16 +02:00
Wolfgang Huß	a97d65da3c	Merge pull request #6532 from Ocelot-Social-Community/docu-deployment-js-files ... docs(other): update TODO-next-update.md for 2.7.0-470 b2.7.0-472	2023-07-11 14:59:31 +02:00
Markus	89caf7b678	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-11 13:43:41 +02:00
Ulf Gebhardt	453ffa4f2b	Merge branch 'master' into docu-deployment-js-files	2023-07-11 13:29:48 +02:00
Ulf Gebhardt	ab5b7a0b8a	Merge pull request #6530 from Ocelot-Social-Community/fix-backend-room-with-self ... fix(backend): chat - do not allow to create room with self b2.7.0-471	2023-07-11 13:29:35 +02:00
Wolfgang Huß	2ffe3a2fd4	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-07-11 13:27:36 +02:00
Wolfgang Huß	c3912304f4	Fix formating	2023-07-11 13:24:55 +02:00
Ulf Gebhardt	1a3f11ac1f	lint locales	2023-07-11 13:23:32 +02:00
Wolfgang Huß	737a8f4380	Revert "Try to filter only for events with location" ... This reverts commit f247e6bd7b7554442493b799780186b916890043.	2023-07-11 13:20:38 +02:00
Wolfgang Huß	a427b21948	Renew submodule 'stage.ocelot.social'	2023-07-11 13:19:35 +02:00
Ulf Gebhardt	40dea17360	update TODO-next-update.md for 2.7.0-470	2023-07-11 13:05:01 +02:00
Ulf Gebhardt	a4bb523cb4	unit test for error when creating room with self	2023-07-11 12:57:37 +02:00
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