13130 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
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
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
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
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	5512482a66	Merge branch 'master' into event-master	2023-04-25 14:30:32 +02:00
mahula	6298194db3	fix updating of group type and action radius changes to the form	2023-04-25 14:11:00 +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
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
Moriz Wahl	3e14c1220d	fix(backned): post type on notifications	2023-04-25 12:41:33 +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
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