5162 Commits

Author	SHA1	Message	Date
Markus	dfd84f921c	[fix] adds white space after mention in comment editor	2023-05-19 15:15:41 +02:00
entermex	f3ea0ea6ef	Fix group list number to six	2023-05-19 12:41:39 +02:00
elweyn	5544f453a6	Backend removed eventLocation, frontend fixes	2023-05-17 22:12:08 +02:00
Markus	df86812fc0	added missing eventLocationName to _EventInputs	2023-05-17 16:17:02 +02:00
Markus	7c37d9f9ef	added conditional check for event time, code syntaxes	2023-05-17 15:32:49 +02:00
Alexander Friedland	cacf08afee	Merge branch 'master' into event-master	2023-05-17 11:05:37 +02:00
ogerly	6b6eeab655	fix lint	2023-05-17 11:03:10 +02:00
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
dependabot[bot]	fb2c924083	Bump node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17 in /webapp ... Bumps node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-15 14:07:15 +00:00
Markus	998b71aa22	Merge branch 'newsfeed-layout-fixes' of github.com:Ocelot-Social-Community/Ocelot-Social into newsfeed-layout-fixes	2023-05-15 14:53:09 +02:00
Markus	95710fd587	[fix] added custom css to newsfeed layout if less than 3 posts are visible	2023-05-15 14:51:23 +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	7894a5f3f3	Merge branch 'master' into 6141-fix-z-layer-of-header-elements	2023-05-12 15:10:19 +02:00
Hannes Heine	24ccdab47f	Merge branch 'master' into newsfeed-layout-fixes	2023-05-12 14:17:27 +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	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