13181 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	ff559e71db	merge #6045 #6267, resolve conflicts, fix save image	2023-05-17 11:01:49 +02:00
ogerly	b4275f44cb	Merge branch '6045-add-event-info-to-post' into event-master	2023-05-17 10:11:39 +02:00
ogerly	245035549c	Merge branch '6267-eventteaser-design-optimization' into event-master	2023-05-17 09:40:10 +02:00
ogerly	b421202e59	resolve conflict	2023-05-17 09:22:15 +02:00
elweyn	a403ffd23c	Merge branch '6266-Event-create-design-optimization' into 6267-eventteaser-design-optimization	2023-05-13 11:51:03 +02:00
elweyn	affd2e5dd8	Merge branch 'event-master' into 6266-Event-create-design-optimization	2023-05-13 11:50:34 +02:00
Hannes Heine	55f6badeaf	Merge branch 'master' into event-master	2023-05-13 11:48:47 +02:00
Markus	c42737a3df	Merge pull request #6279 from Ocelot-Social-Community/6141-fix-z-layer-of-header-elements ... fix(webapp): fix z layer of header elements b2.6.0-401	2023-05-12 16:51:33 +02:00
Hannes Heine	7894a5f3f3	Merge branch 'master' into 6141-fix-z-layer-of-header-elements	2023-05-12 15:10:19 +02:00
Ulf Gebhardt	4eb5c9fb65	Merge pull request #6289 from Ocelot-Social-Community/fix-avatar-group-settings ... fix(webapp): properly render avatars in group settings	2023-05-12 11:11:46 +02:00
Markus	0c2c199e74	added linting	2023-05-10 15:26:33 +02:00
Markus	092feb5ee7	[webapp] added event info to post page	2023-05-10 15:20:01 +02:00
Markus	f2256c8146	[webapp] added event infos to postteaser component	2023-05-10 14:12:07 +02:00
Markus	03a07f3c13	[webapp] added more event info to the postquery for event teaser	2023-05-10 13:56:29 +02:00
Ulf Gebhardt	d7a11e2864	Merge branch 'master' into fix-avatar-group-settings	2023-05-08 13:11:18 +02:00
Ulf Gebhardt	f4efe245a7	properly render avatars in group settings	2023-05-08 13:06:18 +02:00
Markus	02566a6e93	fixed hardcoded z-index of overlay, filter and add-btn	2023-05-02 15:49:26 +02:00
Markus	2d262283db	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-05-02 10:02:02 +02:00
Ulf Gebhardt	a7fec5c1ee	Merge pull request #6271 from Ocelot-Social-Community/v2.6.0 ... chore(release): v2.6.0 b2.6.0-399 2.6.0	2023-04-27 18:00:43 +02:00
Markus	7728784767	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-04-27 13:43:51 +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	d56479dbea	Merge branch '6266-Event-create-design-optimization' into event-master	2023-04-26 13:51:25 +02:00
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 b2.5.1-398	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 b2.5.1-397	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 b2.5.1-396	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