16408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mahula	531bbc9073	remove option from action radius select	2023-04-25 18:04:52 +02:00
mahula	43ed698036	add missing option to action radius select	2023-04-25 17:31:34 +02:00
mahula	60f18c1167	remove comments	2023-04-25 17:26:36 +02:00
ogerly	bc008ddb86	teaser event green	2023-04-25 16:18:40 +02:00
Ulf Gebhardt	4731971632	Merge pull request #6258 from Ocelot-Social-Community/fix-avatars-in-group-member-list ... fix(webapp): show avatar for group members b2.5.1-395	2023-04-25 16:03:51 +02:00
ogerly	bd8ea66922	resolve conflict	2023-04-25 15:28:43 +02:00
ogerly	5387c16fd5	ribbonText	2023-04-25 15:23:02 +02:00
mahula	7732e2a890	Merge branch 'master' into 5441-wrench-refactor-groupform-select-make-a-component	2023-04-25 15:20:07 +02:00
mahula	28e92c25b7	add unit tests to action radius select	2023-04-25 15:19:00 +02:00
mahula	4e76f0c712	linting	2023-04-25 15:18:07 +02:00
Ulf Gebhardt	e1fe57c741	Merge branch 'master' into fix-avatars-in-group-member-list	2023-04-25 15:17:16 +02:00
Moriz Wahl	65ad2a72ad	postType not in fragment	2023-04-25 15:09:36 +02:00
Moriz Wahl	97632a08fd	Merge branch 'event-master' into 6044-Add-create-New-Event	2023-04-25 14:36:34 +02:00
Moriz Wahl	06929e7053	rebase on event master	2023-04-25 14:32:50 +02:00
Moriz Wahl	5512482a66	Merge branch 'master' into event-master	2023-04-25 14:30:32 +02:00
ogerly	032b65fb92	teasr 2	2023-04-25 14:24:31 +02:00
mahula	6298194db3	fix updating of group type and action radius changes to the form	2023-04-25 14:11:00 +02:00
ogerly	affc392b10	teasr	2023-04-25 14:05:17 +02:00
Ulf Gebhardt	24cbd33f83	Merge pull request #6256 from Ocelot-Social-Community/fix-search-3-chars ... fix(webapp): fix search for 3 chars b2.5.1-394	2023-04-25 14:03:39 +02:00
Moriz Wahl	b327cae02d	Merge pull request #6255 from Ocelot-Social-Community/filter-events ... feat(backend): filter posts by post type	2023-04-25 13:49:35 +02:00
Moriz Wahl	1a4398eaf9	remove comments	2023-04-25 13:32:42 +02:00
Ulf Gebhardt	e3b1f97ccd	update faker	2023-04-25 13:30:36 +02:00
Moriz Wahl	8df7d5d265	get it working	2023-04-25 13:27:25 +02:00
ogerly	04d642a4da	Merge branch 'fix-post-type-on-notifications' into 6044-Add-create-New-Event	2023-04-25 13:21:51 +02:00
Ulf Gebhardt	282d701e90	show avatar for group members	2023-04-25 12:44:47 +02:00
Moriz Wahl	3e14c1220d	fix(backned): post type on notifications	2023-04-25 12:41:33 +02:00
ogerly	8dfb22e7a5	merge event-master	2023-04-25 12:35:54 +02:00
Moriz Wahl	3244f3f86d	feat(webapp): group categories on posts	2023-04-25 12:35:46 +02:00
Ulf Gebhardt	bbe77c7ddd	Merge branch 'master' into fix-search-3-chars	2023-04-25 12:02:43 +02:00
Moriz Wahl	e68d8b00fc	Merge pull request #6240 from Ocelot-Social-Community/save-location-address ... feat(backend): save location address	2023-04-25 12:01:37 +02:00
Ulf Gebhardt	c2828a31de	word length limitation set to minimum 2	2023-04-25 12:01:10 +02:00
Moriz Wahl	7b5a88187b	Merge pull request #6242 from Ocelot-Social-Community/group-posts-cannot-be-pinned ... fix(backend): group posts cannot be pinned b2.5.1-393	2023-04-25 12:00:48 +02:00
Ulf Gebhardt	9198ec9a12	ensure 3 characters minimum	2023-04-25 11:47:30 +02:00
mahula	a780f43d82	use object notation for props	2023-04-25 11:07:00 +02:00
ogerly	e012dbd4c4	Merge branch 'master' into 6044-Add-create-New-Event	2023-04-25 09:26:44 +02:00
ogerly	76eb8757cb	merge event master + changes	2023-04-25 09:17:03 +02:00
Ulf Gebhardt	c88cbdc9d8	last lint	2023-04-25 04:41:43 +02:00
Ulf Gebhardt	23588c02ec	more lint fixes	2023-04-25 04:24:34 +02:00
Ulf Gebhardt	e228b42cc4	lint	2023-04-25 04:16:19 +02:00
Ulf Gebhardt	efff3625a9	properly diferentiate between clearbale search and text hints	2023-04-25 04:07:26 +02:00
Ulf Gebhardt	6102ce2fff	more lint fix	2023-04-25 04:05:43 +02:00
Ulf Gebhardt	5c23815a36	lint fixes	2023-04-25 03:50:06 +02:00
Ulf Gebhardt	536ef92132	more simplifications	2023-04-25 03:44:51 +02:00
Ulf Gebhardt	4a5c56203b	simplified searchableInput further - fixed on Enter	2023-04-25 02:44:46 +02:00
Ulf Gebhardt	c7fbe9beef	removed test for onDelete event	2023-04-25 02:36:01 +02:00
Ulf Gebhardt	33d5758686	removed comments	2023-04-25 02:35:43 +02:00
Ulf Gebhardt	6025706b4b	fix searchableInput field component to properly retrigger search on delete, clear properly etc	2023-04-25 02:19:50 +02:00
Ulf Gebhardt	ca24cf4405	simplyfy logic, use language ahortcuts	2023-04-25 02:19:15 +02:00
Ulf Gebhardt	a10916fc14	remove falsy values, but do not limit characters	2023-04-25 02:15:16 +02:00
Moriz Wahl	4091045de6	fix tests (include eventStart)	2023-04-24 17:12:56 +02:00