13208 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	c350915bd8	Merge branch 'event-master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into event-master	2023-04-26 13:50:45 +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
Ulf Gebhardt	54656e5294	Merge pull request #6265 from Ocelot-Social-Community/fix-rebranding-docker-compose ... fix(other): docker-compose for rebranding deployment	2023-04-26 11:40:11 +02:00
Ulf Gebhardt	d675958a1f	fix docker-compose for rebranding deployment	2023-04-26 10:57:07 +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
Hannes Heine	58b59051ce	Merge pull request #6259 from Ocelot-Social-Community/default-categories-of-group ... feat(webapp): default categories of group for posts in group	2023-04-25 22:11:52 +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	29e86228ce	Merge pull request #6257 from Ocelot-Social-Community/fix-post-type-on-notifications ... fix(backend): post type on notifications	2023-04-25 20:43:46 +02:00
Moriz Wahl	f6281960d0	Merge branch 'master' into default-categories-of-group	2023-04-25 20:41:12 +02:00
mahula	c9f2192ebe	Merge pull request #6244 from Ocelot-Social-Community/5441-wrench-refactor-groupform-select-make-a-component ... refactor(webapp): make action radius select in group form a reusable component	2023-04-25 20:32:35 +02:00
ogerly	051c7acd4f	Merge branch 'feature-visualistion-event-post' into 6044-Add-create-New-Event	2023-04-25 20:15:08 +02:00
ogerly	c265300b53	Merge branch 'event-master' into 6044-Add-create-New-Event	2023-04-25 20:14:41 +02:00
ogerly	43728dd0a5	flex system for eventdatas in post	2023-04-25 19:57:48 +02:00
Moriz Wahl	81b4bc7e22	Merge pull request #6262 from Ocelot-Social-Community/recover-missing-commit ... fix(backend): recover missing commit	2023-04-25 19:45:40 +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
Moriz Wahl	fc727e6727	add eventEnd	2023-04-25 19:11:46 +02:00
Moriz Wahl	71d8d4f0b4	fix(backend): recover missing changes	2023-04-25 19:02:01 +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
Ulf Gebhardt	4731971632	Merge pull request #6258 from Ocelot-Social-Community/fix-avatars-in-group-member-list ... fix(webapp): show avatar for group members	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	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