12091 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	62c52a5a7b	Merge pull request #5707 from Ocelot-Social-Community/sanetize-group-description ... fix(backend): sanitize group description b2.2.0-279	2022-11-28 13:48:09 +01:00
Moriz Wahl	5c3d9d893d	add sort categories to category filter menu	2022-11-28 13:46:40 +01:00
Moriz Wahl	bd9a7d1e1b	sort categories as mixin	2022-11-28 13:44:07 +01:00
Moriz Wahl	269f5bd741	Update webapp/components/CategoriesSelect/CategoriesSelect.vue ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-28 12:18:41 +01:00
Moriz Wahl	300dd24151	Merge pull request #5711 from Ocelot-Social-Community/clean-up-webapp-unit-tests ... fix(webapp): clean up webapp unit tests b2.2.0-277	2022-11-28 11:28:20 +01:00
Moriz Wahl	594943d2bd	mock window.open	2022-11-24 19:35:59 +01:00
Moriz Wahl	15fdbe4fbd	mock window open	2022-11-24 19:30:10 +01:00
Moriz Wahl	1d5f0f68e3	feat(webapp): sort categories by name	2022-11-24 19:12:17 +01:00
Moriz Wahl	266d846012	pass correct key to sanitize callback	2022-11-24 18:28:02 +01:00
Moriz Wahl	3e6566bff5	do not sanitize description of embed	2022-11-24 18:24:53 +01:00
Moriz Wahl	41813eeab8	Merge pull request #5652 from Ocelot-Social-Community/search-users-to-add-to-group ... feat(webapp): 🍰 Search Users To Add To Group b2.2.0-276	2022-11-24 18:05:07 +01:00
Moriz Wahl	cff0d1601f	fix(backend): sanitize group description	2022-11-24 17:52:12 +01:00
Moriz Wahl	78672cd2e5	Update webapp/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-11-24 17:18:55 +01:00
Moriz Wahl	46f13d022d	Update webapp/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-11-24 17:18:38 +01:00
Moriz Wahl	29fff79c30	Merge pull request #5699 from Ocelot-Social-Community/params-for-category-filter ... feat(webapp): 🍰 Params For Category Filter b2.2.0-275	2022-11-24 17:17:52 +01:00
Moriz Wahl	98687047ab	Merge pull request #5703 from Ocelot-Social-Community/fix-misspelled-notification ... fix(backend): 🍰 Misspelled Notification b2.2.0-274	2022-11-24 17:17:33 +01:00
Ulf Gebhardt	31d39b3bdd	Merge pull request #5637 from Ocelot-Social-Community/fix_jest_coverage_report ... test(other): jest coverage report in console b2.2.0-273	2022-11-24 01:37:00 +01:00
Moriz Wahl	e0b7d34745	esnure that username is correct	2022-11-23 18:06:50 +01:00
Moriz Wahl	287e5c29ea	changes suggested by @tirokk	2022-11-23 17:53:43 +01:00
Wolfgang Huß	02598e5224	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist	2022-11-23 14:34:23 +01:00
Wolfgang Huß	57bbcd9025	Add locales README.md for quotation marks	2022-11-23 14:32:02 +01:00
Wolfgang Huß	7d3631307b	Fix quotation marks for English locale 'settings.social-media.delete-modal.message'	2022-11-23 14:31:15 +01:00
Wolfgang Huß	bda0b3f088	Fix Cypress tests for the users social media ... - Refactor Cypress tests to make them more language independent. Co-Authored-By: mahula <lenzmath@posteo.de>	2022-11-23 14:22:45 +01:00
Moriz Wahl	b7c620c78c	clear input field after select	2022-11-23 09:47:13 +01:00
Moriz Wahl	2112ee2965	fix(backend): misspelled notification	2022-11-23 09:19:59 +01:00
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