5490 Commits

Author	SHA1	Message	Date
Markus	02566a6e93	fixed hardcoded z-index of overlay, filter and add-btn	2023-05-02 15:49:26 +02:00
Markus	013ec20e75	Merge branch 'master' into newsfeed-layout-fixes	2023-04-27 13:48:20 +02:00
Markus	f828497c96	updated of mobile media querys for top gap of newsfeed	2023-04-27 13:43:04 +02:00
Ulf Gebhardt	5fbdab6888	v2.6.0	2023-04-27 12:33:55 +02:00
Alexander Friedland	2426f5db88	Merge branch 'master' into 6266-Event-create-design-optimization	2023-04-27 08:41:41 +02:00
ogerly	5b256ed3e4	fix lint	2023-04-26 13:44:31 +02:00
ogerly	909a8f29fd	refactor style	2023-04-26 13:43:14 +02:00
ogerly	7d3d25fc7c	datepicker hide dates before today	2023-04-26 11:53:46 +02:00
ogerly	e0b93ae796	Merge remote-tracking branch 'origin/fix-category-filter-buttons' into merge-all-events	2023-04-26 09:00:47 +02:00
ogerly	b6ffdab321	refactor post event	2023-04-26 08:56:57 +02:00
Moriz Wahl	153ef7ae14	test getters and setters for post type filters	2023-04-25 22:12:41 +02:00
ogerly	2c5576f8a1	fix lint, fix locales	2023-04-25 22:11:25 +02:00
ogerly	fad1ab212e	locales, style, events	2023-04-25 22:03:05 +02:00
Moriz Wahl	fa4ecaa3f6	filter by post type	2023-04-25 22:02:44 +02:00
Moriz Wahl	fcfce54563	fix(webapp): category filter buttons	2023-04-25 21:08:47 +02:00
ogerly	ef0ee1ec0d	Merge branch '6044-Add-create-New-Event' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6044-Add-create-New-Event	2023-04-25 21:05:04 +02:00
ogerly	fbdb6ca074	show all event datas in post	2023-04-25 21:04:58 +02:00
Ulf Gebhardt	72ae881d9a	fixed undefined post problem	2023-04-25 21:03:24 +02:00
Moriz Wahl	f6281960d0	Merge branch 'master' into default-categories-of-group	2023-04-25 20:41:12 +02:00
ogerly	43728dd0a5	flex system for eventdatas in post	2023-04-25 19:57:48 +02:00
Moriz Wahl	2e202e401e	Merge branch 'master' into default-categories-of-group	2023-04-25 19:42:51 +02:00
mahula	8fdf89d153	Merge branch 'master' into 5441-wrench-refactor-groupform-select-make-a-component	2023-04-25 19:15:17 +02:00
ogerly	c930dd6d52	last step construct	2023-04-25 18:45:23 +02:00
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
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
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
Moriz Wahl	1a4398eaf9	remove comments	2023-04-25 13:32:42 +02:00
Moriz Wahl	8df7d5d265	get it working	2023-04-25 13:27:25 +02:00
Ulf Gebhardt	282d701e90	show avatar for group members	2023-04-25 12:44:47 +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
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