13956 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Markus	57cf245b71	fixed linting	2023-07-19 21:53:05 +02:00
Markus	084b14608d	updated CategoriesFilter tests	2023-07-19 21:47:26 +02:00
Markus	f927c13b86	[refactor] updated layout/ui of filter menu	2023-07-19 21:47:02 +02:00
Markus	e33091b814	fix linting	2023-07-11 14:36:24 +02:00
Markus	a1b6576162	[refactor] adjusted label texts for filter menu	2023-07-11 14:26:45 +02:00
Markus	e81254e531	[refactor] changed button layout in filter menu	2023-07-11 14:26:19 +02:00
Markus	7c56ad9728	[refactor] removed hr in categories filter component	2023-07-11 14:10:39 +02:00
Markus	e1a9b5b7f7	[refactor] added new filter menu headline and adjusted some filter labels	2023-07-11 14:07:36 +02:00
Markus	0493a2c6c0	[refactor] changed filter layout in filter menu	2023-07-11 14:06:29 +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	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
Ulf Gebhardt	a4bb523cb4	unit test for error when creating room with self	2023-07-11 12:57:37 +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
Ulf Gebhardt	073adbe48c	do not allow to create room with self	2023-07-11 11:19:01 +02:00
Markus	2cff87e1cf	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-11 09:56:50 +02:00
Ulf Gebhardt	1ee2dc70bb	Merge pull request #6524 from Ocelot-Social-Community/frontend-messages ... feat(webapp): chat message capability b2.7.0-470	2023-07-10 20:56:59 +02:00
Ulf Gebhardt	3134c7311c	Merge branch 'master' into frontend-messages	2023-07-10 19:44:27 +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 b2.7.0-469	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
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 b2.7.0-468	2023-07-10 16:58:21 +02:00
Ulf Gebhardt	0ad59d9412	lint fix	2023-07-10 16:27:36 +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 b2.7.0-467	2023-07-10 15:26:22 +02:00
Ulf Gebhardt	88e2091804	fix comments	2023-07-10 13:37:42 +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
Markus	67768c008f	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-10 10:56:59 +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 b2.7.0-466	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
Markus	5d640c2da5	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-08 16:05:03 +02:00
dependabot[bot]	f0d4c7ac22	Bump cypress from 12.14.0 to 12.17.0 ... Bumps [cypress](https://github.com/cypress-io/cypress) from 12.14.0 to 12.17.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v12.14.0...v12.17.0) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-08 01:16:57 +00:00
Ulf Gebhardt	77132adc62	Merge pull request #6508 from Ocelot-Social-Community/fix-branded-build2 ... fix(backend): fix branded build (migration) b2.7.0-465	2023-07-08 00:19:35 +02:00
Hannes Heine	0d7cd5b4e1	Merge branch 'master' into fix-branded-build2	2023-07-07 23:11:41 +02:00
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 b2.7.0-464	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 b2.7.0-463	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 b2.7.0-462	2023-07-07 08:41:29 +02:00