12673 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	3ee9053623	better to encrypt .env	2023-03-14 01:39:27 +01:00
Ulf Gebhardt	57d33821c5	do not encrypt .env	2023-03-14 01:36:55 +01:00
Ulf Gebhardt	3a3e576047	moved values files and removed .gitignore	2023-03-13 13:12:46 +01:00
Ulf Gebhardt	c06b6c82ee	secrets scripts	2023-03-13 13:08:22 +01:00
Wolfgang Huß	1a82a32b2e	Merge pull request #6056 from Ocelot-Social-Community/6030-remove-docker-compose-file-for-apple-m1 ... chore(other): remove apple m1 docker overrides	2023-03-08 14:58:09 +01:00
Wolfgang Huß	7c201eb648	Merge branch 'master' into 6030-remove-docker-compose-file-for-apple-m1	2023-03-08 14:12:37 +01:00
Ulf Gebhardt	401152c2e8	Merge pull request #6083 from Ocelot-Social-Community/new-ocelot-workflows-publish-deploy ... refactor(other): ocelot publish workflows	2023-03-08 00:43:44 +01:00
Ulf Gebhardt	c7a850f3df	Merge branch 'master' into new-ocelot-workflows-publish-deploy	2023-03-07 22:39:18 +01:00
Ulf Gebhardt	6aa1e39a8e	Merge pull request #6088 from Ocelot-Social-Community/lint_pr_only_on_pr_not_push ... fix(other): lint pr only on pullrequest	2023-03-07 22:38:58 +01:00
Ulf Gebhardt	95790f3a45	Merge branch 'master' into lint_pr_only_on_pr_not_push	2023-03-07 21:59:14 +01:00
Ulf Gebhardt	9bf9d0b5fd	Merge branch 'master' into new-ocelot-workflows-publish-deploy	2023-03-07 21:58:59 +01:00
Ulf Gebhardt	829a8c1207	Merge pull request #6096 from Ocelot-Social-Community/dependabot_no_rebase ... fix(other): dependabot do not rebase	2023-03-07 21:58:38 +01:00
Ulf Gebhardt	e00c2dd8dd	Merge branch 'master' into lint_pr_only_on_pr_not_push	2023-03-07 18:01:32 +01:00
Ulf Gebhardt	a0f782eb53	Merge branch 'master' into dependabot_no_rebase	2023-03-07 16:09:30 +01:00
Ulf Gebhardt	ace8b8637f	dont rebase automatically to avoid workflow slots beeing used	2023-03-07 16:08:32 +01:00
Moriz Wahl	5538ef93db	Merge pull request #6091 from Ocelot-Social-Community/filter-posts-in-my-groups ... feat(backend): filter posts in my groups	2023-03-07 16:01:29 +01:00
Moriz Wahl	0da3691757	Merge branch 'master' into filter-posts-in-my-groups	2023-03-07 13:56:03 +01:00
Hannes Heine	2bab4b5b53	Merge pull request #6022 from Ocelot-Social-Community/5152-remove-helper-jest-gql-function ... refactor(backend): withdraw mock of gql and replace with graphql-tag function	2023-03-07 13:33:54 +01:00
Moriz Wahl	f75059b830	Merge branch 'master' into filter-posts-in-my-groups	2023-03-07 13:30:02 +01:00
Wolfgang Huß	7f3244db12	Merge branch 'master' into 6030-remove-docker-compose-file-for-apple-m1	2023-03-07 11:50:07 +01:00
Hannes Heine	438dc73dcd	Merge branch 'master' into 5152-remove-helper-jest-gql-function	2023-03-07 09:09:52 +01:00
sushidave	4d6b22754e	Merge pull request #6090 from Ocelot-Social-Community/sushidave-updated-main-readme ... docs(other): update readme.md	2023-03-06 20:19:44 +01:00
sushidave	aba74cd5c6	Change order of sections	2023-03-06 19:08:29 +01:00
sushidave	ec77da7ad3	Update README.md ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2023-03-06 19:06:28 +01:00
Wolfgang Huß	b959a555d2	Merge branch 'master' into sushidave-updated-main-readme	2023-03-06 18:50:34 +01:00
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	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
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	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	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