16408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	9bb770ae8e	Fix spelling of README.md ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2023-03-06 18:50:26 +01:00
Wolfgang Huß	c73e937f37	Merge pull request #6063 from Ocelot-Social-Community/6062-adjust-and-create-branding-possibilities ... feat(webapp): adjust and create branding possibilities b2.4.0-322	2023-03-06 18:41:19 +01:00
Wolfgang Huß	4ffa0adbed	Merge branch 'master' into 5152-remove-helper-jest-gql-function	2023-03-06 18:37:52 +01:00
Wolfgang Huß	fa7927a379	Replace docu text by Ulf's suggestion ... Co-Authored-By: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-03-06 18:34:27 +01:00
Wolfgang Huß	cd498a17f0	Replace docu text by Ulf's suggestion ... Co-Authored-By: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-03-06 18:31:56 +01:00
Wolfgang Huß	1b27c17779	Remove deployment/DOCKER_MORE_CLOSELY.md	2023-03-06 18:30:56 +01:00
Wolfgang Huß	539a39463f	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6030-remove-docker-compose-file-for-apple-m1	2023-03-06 18:27:37 +01:00
Wolfgang Huß	98bc200fbc	Merge branch 'master' into 6062-adjust-and-create-branding-possibilities	2023-03-06 18:01:15 +01:00
Moriz Wahl	32aa5892a6	improve code	2023-03-06 16:29:35 +01:00
Moriz Wahl	1fa8831110	undo changes to filter menu section	2023-03-06 16:25:45 +01:00
Moriz Wahl	1575ee9765	Ebertsche Knöpfe for filter by posts in my groups	2023-03-06 16:20:45 +01:00
Moriz Wahl	a784b0f860	test filter by posts in my groups	2023-03-06 16:11:17 +01:00
Moriz Wahl	b63ade8da1	add filter posts by my groups	2023-03-06 16:05:15 +01:00
Moriz Wahl	d2462c34f1	add filter by posts in my groups to store and test it	2023-03-06 16:00:50 +01:00
Moriz Wahl	77ca09ed04	after all clean DB	2023-03-06 15:32:29 +01:00
Moriz Wahl	11a7dc2881	test filter posts in my groups	2023-03-06 15:28:43 +01:00
Moriz Wahl	d41b99b913	feat(backend): filter posts of my groups	2023-03-06 15:00:52 +01:00
sushidave	57f9b0d490	Update README.md ... Add general information	2023-03-06 14:59:09 +01:00
Moriz Wahl	db8ad8897e	same cypher for removeUserFromGroup and leaveGroup, adjust tests, admin cannot remove users fro group	2023-03-06 14:11:55 +01:00
Moriz Wahl	eb0bc971ec	Update webapp/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2023-03-06 13:47:28 +01:00
Moriz Wahl	6d09dbcf08	Update webapp/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2023-03-06 13:47:14 +01:00
Ulf Gebhardt	682a7d9d50	lint pr only when there is a pullrequest not on every push	2023-03-06 13:26:50 +01:00
Ulf Gebhardt	ccb0819893	Merge branch 'master' into new-ocelot-workflows-publish-deploy	2023-03-06 12:42:21 +01:00
Ulf Gebhardt	63e519428c	publish only on master & build tag prefix	2023-03-06 12:38:17 +01:00
Ulf Gebhardt	5b8fcc945c	Merge pull request #6085 from Ocelot-Social-Community/lint_pr_not_for_dependabot ... fix(other): exclude dependabot from pr title linting b2.4.0-321	2023-03-06 12:37:48 +01:00
Ulf Gebhardt	4bfba1983f	define repo and refacor event name	2023-03-06 12:37:20 +01:00
Ulf Gebhardt	9bc95908ae	use github token explicitly, use explicit ocelot version in brad test2.4.0-319	2023-03-06 11:39:39 +01:00
Ulf Gebhardt	4f16cbe388	Merge branch 'master' into lint_pr_not_for_dependabot	2023-03-06 11:09:24 +01:00
Ulf Gebhardt	0f4e609667	exclude dependabot from pr title linting	2023-03-06 11:06:08 +01:00
Ulf Gebhardt	8e40791773	pat token, dependance on compylete publish test2.4.0-318	2023-03-06 11:01:25 +01:00
Ulf Gebhardt	baedff2f94	use trigger to call other workflow	2023-03-06 10:53:23 +01:00
Hannes Heine	f7c870b178	Merge pull request #6027 from Ocelot-Social-Community/6013-change-benutzer-to-nutzer ... feat(webapp): change ``Benutzer`` to ``Nutzer`` b2.4.0-316	2023-03-06 10:27:37 +01:00
Hannes Heine	0ed0609298	Merge branch 'master' into cypress-migrate-to-v10	2023-03-06 08:26:04 +01:00
Ulf Gebhardt	540c3bd9c4	referencing envs in a second step test2.4.0-315	2023-03-05 15:07:32 +01:00
Ulf Gebhardt	62e3b30427	no quotations	2023-03-05 15:03:57 +01:00
Ulf Gebhardt	71dc31d926	try different quotations	2023-03-05 15:02:10 +01:00
Ulf Gebhardt	d271ff3760	use long version of docker build flags	2023-03-05 15:00:10 +01:00
Ulf Gebhardt	99601963f1	cleanup publish workflow for non-branded version	2023-03-05 14:51:04 +01:00
elweyn	a724fec881	Remove unused graphql packages from cypress modul.	2023-03-03 21:28:49 +01:00
elweyn	a09960aa54	Remove gql tag of cypress code.	2023-03-03 20:40:16 +01:00
Moriz Wahl	e298a29d8b	test remove user from group	2023-03-03 18:38:41 +01:00
Hannes Heine	3a5349c547	Merge branch 'master' into 5152-remove-helper-jest-gql-function	2023-03-03 18:27:38 +01:00
Moriz Wahl	c4d7c20b27	remove user from group implemented	2023-03-03 17:55:22 +01:00
Moriz Wahl	6a84a02027	add remove user from group mutation	2023-03-03 17:46:20 +01:00
Moriz Wahl	e384ec5ea6	message for removal og group members	2023-03-03 17:43:41 +01:00
Markus	aea21b0989	Fix missing padding above newsfeed for mobile view	2023-03-03 17:43:02 +01:00
Moriz Wahl	640f2519f3	clean database after all	2023-03-03 17:43:01 +01:00
Moriz Wahl	cd3e2ee8ad	test remove user from group mutation	2023-03-03 17:29:48 +01:00
Moriz Wahl	608ebb0a62	remove user from group mutations	2023-03-03 16:43:24 +01:00
Moriz Wahl	de7dded197	add permisson for removeUserFromGroup	2023-03-03 16:42:49 +01:00