5490 Commits

Author	SHA1	Message	Date
Wolfgang Huß	afbcb1244d	Fix comment typing	2023-05-30 11:44:52 +02:00
Wolfgang Huß	0acc41dc73	Implement dev switch for stop automatic closing of filter menu	2023-05-30 11:44:23 +02:00
Wolfgang Huß	f2555fdbc4	Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events	2023-05-30 10:41:47 +02:00
Wolfgang Huß	133e584dec	Add 'All' button to filter menu post type buttons ... - Unset post type filter menu button by clicking a set button.	2023-05-26 19:40:14 +02:00
Wolfgang Huß	3fa8c3d2e3	Change behavior of filter menu post type buttons to switch between them by click	2023-05-26 19:22:55 +02:00
Wolfgang Huß	a3c3b02729	Fix filter button and post type filter menu labels	2023-05-26 19:21:17 +02:00
entermex	6807b6f543	Fix notification menu comment hash	2023-05-25 13:10:32 +02:00
Ulf Gebhardt	04ab8148f9	lint fixes	2023-05-25 12:41:04 +02:00
Ulf Gebhardt	73417079ed	fix eslint ignore	2023-05-25 12:40:32 +02:00
Ulf Gebhardt	3f1e42e6fd	externalize styles	2023-05-25 12:15:03 +02:00
Ulf Gebhardt	2bd8a7ef04	make time selection to be always valid	2023-05-25 11:56:10 +02:00
Ulf Gebhardt	572272b581	typo	2023-05-25 11:26:31 +02:00
entermex	bb3047a21a	Merge branch 'master' into 6307-group-list-number-to-six	2023-05-25 11:23:53 +02:00
Ulf Gebhardt	e6e972e50e	removed compiled css files	2023-05-25 11:22:56 +02:00
Ulf Gebhardt	13c7f080f0	removed compiled css files	2023-05-25 11:19:08 +02:00
Wolfgang Huß	2ba2da75a3	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-25 09:39:03 +02:00
Wolfgang Huß	8ca94d17a4	Upgrade node version in '.nvmrc' files to v20.2.0	2023-05-24 16:00:48 +02:00
Markus	87b41769f1	Merge branch 'master' into newsfeed-layout-fixes	2023-05-24 10:17:00 +02:00
Markus	12a4ab6b83	merged master and resolved conflict in webapp/pages/index.vue	2023-05-24 10:16:07 +02:00
Markus	acf68796e6	Merge branch 'master' into 6142-comment-mention-missing-white-space	2023-05-24 09:32:55 +02:00
Moriz Wahl	a701f37064	Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-23 11:43:45 +02:00
Hannes Heine	5c13af43d9	Merge branch 'master' into event-master	2023-05-23 11:42:09 +02:00
Moriz Wahl	9086986053	fix filter menu tests	2023-05-23 11:41:09 +02:00
Moriz Wahl	60b05379d9	post page test fixed	2023-05-23 11:29:18 +02:00
Wolfgang Huß	cc581350cd	Merge branch 'master' into 6307-group-list-number-to-six	2023-05-23 11:24:33 +02:00
Moriz Wahl	e3eaaf4435	fix tests for contribution form	2023-05-23 11:04:01 +02:00
dependabot[bot]	c754b766f8	Bump node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17 in /webapp ... Bumps node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-23 08:49:33 +00:00
Moriz Wahl	59e7f8c0d2	fix post teaser unit tests and linting	2023-05-22 17:12:32 +02:00
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