16408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Markus	e0183a949f	Merge pull request #6154 from Ocelot-Social-Community/newsfeed-layout-fixes ... fix(webapp): fix newsfeed layout b2.6.0-416	2023-05-24 10:46:03 +02:00
Markus	87b41769f1	Merge branch 'master' into newsfeed-layout-fixes	2023-05-24 10:17:00 +02:00
Markus	e54629554b	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-05-24 10:16:44 +02:00
Markus	12a4ab6b83	merged master and resolved conflict in webapp/pages/index.vue	2023-05-24 10:16:07 +02:00
Markus	7b6fed6d64	Merge pull request #6308 from Ocelot-Social-Community/6142-comment-mention-missing-white-space ... fix(webapp): adds white space after user handle in comment editor b2.6.0-415	2023-05-24 09:57:48 +02:00
Markus	acf68796e6	Merge branch 'master' into 6142-comment-mention-missing-white-space	2023-05-24 09:32:55 +02:00
Markus	7bf2a8b25e	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-05-24 09:32:21 +02:00
Ulf Gebhardt	a929cca1a5	readd date-fns	2023-05-23 23:49:41 +02:00
Ulf Gebhardt	58c28c37a4	Merge pull request #6076 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/validator-13.9.0 ... Bump validator from 13.0.0 to 13.9.0 in /backend b2.6.0-414	2023-05-23 23:10:37 +02:00
Ulf Gebhardt	a1ff033293	move wait-on to dev-dependencies	2023-05-23 22:57:57 +02:00
Ulf Gebhardt	4456aab5df	remove npm-run-all	2023-05-23 22:56:54 +02:00
Ulf Gebhardt	9718c78e1d	removed codecov	2023-05-23 22:54:52 +02:00
Ulf Gebhardt	033be90dd6	add missing wait-on, remove date-fns	2023-05-23 22:53:39 +02:00
Ulf Gebhardt	4800598140	removed travis	2023-05-23 22:53:21 +02:00
dependabot[bot]	49d959d7a5	Bump validator from 13.0.0 to 13.9.0 in /backend ... Bumps [validator](https://github.com/validatorjs/validator.js) from 13.0.0 to 13.9.0. - [Release notes](https://github.com/validatorjs/validator.js/releases) - [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/validatorjs/validator.js/compare/13.0.0...13.9.0) --- updated-dependencies: - dependency-name: validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-23 18:53:30 +00:00
Ulf Gebhardt	60ef71a467	Merge pull request #6312 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.34.4 ... Bump metascraper-soundcloud from 5.34.2 to 5.34.4 in /backend b2.6.0-413	2023-05-23 20:28:56 +02:00
dependabot[bot]	69a01e2bf9	Bump metascraper-soundcloud from 5.34.2 to 5.34.4 in /backend ... Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-soundcloud) from 5.34.2 to 5.34.4. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-soundcloud/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-soundcloud) --- updated-dependencies: - dependency-name: metascraper-soundcloud dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-23 17:55:17 +00:00
Ulf Gebhardt	67de6405b9	Merge pull request #6287 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-audio-5.34.4 ... Bump metascraper-audio from 5.33.5 to 5.34.4 in /backend b2.6.0-412	2023-05-23 19:29:53 +02:00
dependabot[bot]	09bfc32d97	Bump metascraper-audio from 5.33.5 to 5.34.4 in /backend ... Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-audio) from 5.33.5 to 5.34.4. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-audio/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-audio) --- updated-dependencies: - dependency-name: metascraper-audio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-23 15:34:38 +00:00
Ulf Gebhardt	53200fbef3	Merge pull request #6310 from Ocelot-Social-Community/dependabot/docker/backend/node-20.2.0-alpine3.17 ... Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17 in /backend b2.6.0-411	2023-05-23 17:28:48 +02:00
Ulf Gebhardt	2f362972fe	remove comment of unused(&deprecated) package	2023-05-23 17:25:31 +02:00
Ulf Gebhardt	ee954c3a30	remove unused packages backend	2023-05-23 17:25:10 +02:00
dependabot[bot]	8f9ebd77b2	Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17 in /backend ... Bumps node from 19.9.0-alpine3.17 to 20.2.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-23 14:24:08 +00:00
Wolfgang Huß	db6e45dafe	Merge pull request #6324 from Ocelot-Social-Community/6323-add-missing-todo-in-deployment-readme ... docs(other): add missing todo in deployment readme 'TODO-next-update.md' b2.6.0-410	2023-05-23 14:16:26 +02:00
Wolfgang Huß	6edca68fc9	Add missing todo in deployment readme 'TODO-next-update.md'	2023-05-23 13:19:06 +02:00
Ulf Gebhardt	8324ae4b3a	corrected schema	2023-05-23 12:56:35 +02:00
Ulf Gebhardt	951a35df1e	fix several queries to have the right types	2023-05-23 12:50:45 +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
elweyn	5065265dc6	Merge branch 'event-master' into seed-posts-as-articles	2023-05-23 11:43:27 +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
Ulf Gebhardt	61ba556e4a	Merge pull request #6309 from Ocelot-Social-Community/dependabot/docker/webapp/node-20.2.0-alpine3.17 ... Bump node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17 in /webapp b2.6.0-409	2023-05-23 11:19:12 +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
Ulf Gebhardt	238e566954	typo	2023-05-23 01:55:48 +02:00
Ulf Gebhardt	dd682e26af	wrongly commited index.js file removed	2023-05-23 01:53:53 +02:00
Ulf Gebhardt	1b8e5cc0a3	correct our schema defintion	2023-05-23 01:50:06 +02:00
Ulf Gebhardt	8ca55f4d6e	enable typescript	2023-05-23 01:49:55 +02:00
Ulf Gebhardt	684314d0e1	Merge branch 'master' into update-database	2023-05-22 20:29:52 +02:00
Moriz Wahl	59e7f8c0d2	fix post teaser unit tests and linting	2023-05-22 17:12:32 +02:00
Moriz Wahl	30ce9e8460	add description to migration	2023-05-22 17:06:32 +02:00
Ulf Gebhardt	0c4b789da1	remove write rights where its not needed	2023-05-22 16:58:19 +02:00
Ulf Gebhardt	8223024c30	removed write rights from query where its not needed	2023-05-22 16:58:04 +02:00
Ulf Gebhardt	2204b29c0a	fixed review updatedAt mutation	2023-05-22 16:08:50 +02:00
Ulf Gebhardt	144d39b35a	fixed updatedAt field for fileReport	2023-05-22 15:58:19 +02:00
Hannes Heine	e5ccc2569f	Merge branch 'master' into 6307-group-list-number-to-six	2023-05-22 15:42:53 +02:00
Moriz Wahl	16e0551fd9	Merge branch 'master' into event-master	2023-05-22 14:47:08 +02:00
Ulf Gebhardt	3e4ac2ef5e	Merge pull request #6318 from Ocelot-Social-Community/fix-helmet ... fix(backend): helmet fix b2.6.0-408	2023-05-22 13:21:07 +02:00