11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	4535e5d9c5	test category filter by params	2022-11-22 20:06:50 +01:00
Moriz Wahl	88143d7f02	feat(webapp): category filter via params	2022-11-22 19:58:46 +01:00
Moriz Wahl	8bf22921cf	use variable spacing instead of fix value in css	2022-11-22 12:40:13 +01:00
Moriz Wahl	3c4eb2fc91	Merge branch 'master' into search-users-to-add-to-group	2022-11-22 12:31:56 +01:00
Moriz Wahl	5adf6b387d	do not open modal if selected user is already member of group	2022-11-22 12:29:56 +01:00
Moriz Wahl	0d160c0280	add modal to add group member confrimation	2022-11-22 12:24:02 +01:00
Moriz Wahl	9ef44ed23c	new locales for add group member	2022-11-22 12:22:40 +01:00
Ulf Gebhardt	b3ba795023	missing newline	2022-11-21 23:24:24 +01:00
Ulf Gebhardt	a01aee89a9	reverted yarn lock	2022-11-21 23:23:37 +01:00
Ulf Gebhardt	b76d89b008	don't run in band for frontend (maybe fixes ci problems)	2022-11-18 13:03:47 +01:00
Ulf Gebhardt	ba72956536	lint fix	2022-11-18 10:53:22 +01:00
SvFedoriv	a2b7a2e8ef	Merge pull request #5674 from Ocelot-Social-Community/5608-centred-mobil-menu ... fix(webapp): centralize mobile hamburger menu b2.2.0-272	2022-11-15 13:07:45 +01:00
SvFedoriv	3b3f41f6d7	Fix path in seed file	2022-11-15 11:56:38 +01:00
SvFedoriv	e34ee1a259	Centrelize mobile hamburer menu	2022-11-15 08:52:35 +01:00
ogerly	fc93017498	fix lint	2022-11-10 10:28:31 +01:00
ogerly	42d14421e0	style dropdwon search menu outside cards	2022-11-10 10:23:51 +01:00
ogerly	ec6c46a418	Merge branch 'search-users-to-add-to-group' of https://github.com/Ocelot-Social-Community/Ocelot-Social into search-users-to-add-to-group	2022-11-10 09:17:08 +01:00
Wolfgang Huß	cc56066b67	Merge pull request #5661 from Ocelot-Social-Community/5660-move-content-of-db_graphql-folder-to-graphql-folder ... refactor(backend): 🍰 Move `db/graphql` Folder Content To `graphql` Folder b2.2.0-271	2022-11-09 13:33:17 +01:00
Ulf Gebhardt	e32054acb8	include NODE_OPTIONS=--max-old-space-size=8192 again	2022-11-09 10:39:59 +01:00
Wolfgang Huß	e2f0e83c6f	Move db/graphql folder content to graphql – backend	2022-11-09 09:08:17 +01:00
Moriz Wahl	b5ed19a72a	feat(webapp): Search Users to Add to Group	2022-11-08 09:03:38 +01:00
Ulf Gebhardt	3e4e353878	Merge pull request #5634 from Ocelot-Social-Community/workflow_semantic_pullrequests ... feat(other): semantic pullrequest workflow b2.2.0-270	2022-11-08 00:48:10 +01:00
Moriz Wahl	0364bfa402	Merge pull request #5635 from Ocelot-Social-Community/cannot-add-members-to-group ... fix: Cannot Add Group Members as New Members to Group b2.2.0-269	2022-11-07 18:39:19 +01:00
Ulf Gebhardt	04c01b522c	webapp instead of frontend	2022-11-07 18:34:48 +01:00
Ulf Gebhardt	73d2e4af29	backend: jest coverage report	2022-11-07 18:34:02 +01:00
Ulf Gebhardt	a5200893f4	reverted all package updates	2022-11-07 18:33:47 +01:00
Ulf Gebhardt	f57e11dd02	frontend: jest coverage	2022-11-07 18:23:54 +01:00
Moriz Wahl	66748ee83f	Merge pull request #5631 from Ocelot-Social-Community/fix-my-groups-count ... fix: My Groups Count Includes Pending Membership b2.2.0-268	2022-11-07 17:59:56 +01:00
Moriz Wahl	cb57e09d30	change variable names for better understanding	2022-11-07 17:49:36 +01:00
Moriz Wahl	55003447e5	check if user is member before adding user to group	2022-11-07 16:58:21 +01:00
Moriz Wahl	a1fcc40432	fix: Member of Group Cannot Be Added as New Member	2022-11-07 16:57:16 +01:00
Ulf Gebhardt	1294a7dd31	semantic pullrequest workflow	2022-11-07 16:56:20 +01:00
Moriz Wahl	1c900d63f4	fix: My Groups Count Includes Pending Membership	2022-11-07 15:26:09 +01:00
Wolfgang Huß	4cd8c58f53	Merge pull request #5610 from Ocelot-Social-Community/5609-release-v2.2.0 ... chore: 🍰 Release v2.2.0 b2.2.0-267 2.2.0	2022-10-28 16:52:04 +02:00
Wolfgang Huß	82ad94f5da	Release v2.2.0	2022-10-28 16:03:01 +02:00
Wolfgang Huß	9a17ac12f1	Merge pull request #5597 from Ocelot-Social-Community/5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu ... refactor: 🍰 Refactor Design Of Category Filter In Filter Menu b2.1.0-266	2022-10-28 15:37:42 +02:00
ogerly	d2f431d58c	coverage from 64 to 63	2022-10-28 15:04:16 +02:00
ogerly	52dcd772fa	comment out LanguagesFilter, EmotionsFilter, fix tests, fix lint	2022-10-28 14:24:57 +02:00
ogerly	e7fe6a9d3d	Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-28 13:46:38 +02:00
Wolfgang Huß	7f26c0184a	Merge pull request #5590 from Ocelot-Social-Community/5545-Footer-And-Header-Links-Configurable ... feat: 🍰 Footer And Header Links Configurable To Have External Link Target b2.1.0-265	2022-10-28 13:46:02 +02:00
Wolfgang Huß	30dd5ec546	Merge pull request #5546 from Ocelot-Social-Community/Make-Header-Menu-To-Component ... feat: 🍰 Header Menu To Component And Other Refinements b2.1.0-264	2022-10-28 13:45:45 +02:00
ogerly	bf87033b33	Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-28 13:44:47 +02:00
Moriz Wahl	d5d0402205	Merge pull request #5607 from Ocelot-Social-Community/webapp-comments-on-groups ... fix: 🍰 Comments On Posts In Groups In Webapp b2.1.0-263	2022-10-28 13:44:09 +02:00
ogerly	128a98cc27	unused slot sidebar in filter menu, an d style	2022-10-28 13:39:16 +02:00
ogerly	2532dae733	fix lint	2022-10-28 13:16:20 +02:00
Wolfgang Huß	f7cc020feb	Fix linting	2022-10-28 13:15:44 +02:00
ogerly	c0bab3cd50	fix test	2022-10-28 13:15:44 +02:00
Wolfgang Huß	48d6bf6bd1	Remove commented 'deleteMember'	2022-10-28 13:14:55 +02:00
Wolfgang Huß	65431c2baf	Merge branch '5545-Footer-And-Header-Links-Configurable' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable ... # Conflicts: # webapp/components/Group/GroupMember.vue	2022-10-28 13:13:53 +02:00
Wolfgang Huß	27589a64ba	Fix target property in 'HeaderMenu.vue'	2022-10-28 13:08:39 +02:00