13785 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	87fcaad490	Merge pull request #6359 from Ocelot-Social-Community/fix-webapp-unit-tests ... fix(webapp): warnings in unit tests b2.6.0-431	2023-06-05 12:45:51 +02:00
elweyn	1626b06948	Revert "refactor(webapp): changed locaalized text for article ribbon." ... This reverts commit 75f18e60d3d358b1586cac1ed021344d7c490ba5.	2023-06-05 12:33:48 +02:00
Wolfgang Huß	71d964ae93	Merge branch 'master' into 6339-bug-webapp-event-update-page	2023-06-05 11:32:03 +02:00
Moriz Wahl	ddd60667a2	Merge branch 'master' into fix-webapp-unit-tests	2023-06-05 11:16:36 +02:00
Hannes Heine	0533fc687e	Merge branch 'master' into alternate-solution-filter-order-post-types	2023-06-05 10:45:38 +02:00
Ulf Gebhardt	90a3ad0c6a	Merge pull request #6372 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-title-5.34.7 ... Bump metascraper-title from 5.33.5 to 5.34.7 in /backend b2.6.0-430	2023-06-05 10:42:13 +02:00
Ulf Gebhardt	c435fb7246	renable full e2e scenario	2023-06-05 10:38:18 +02:00
Ulf Gebhardt	d1d4317265	increase timeout	2023-06-05 10:36:51 +02:00
Ulf Gebhardt	94efe01a56	revereted change to workflow.yml	2023-06-05 10:34:51 +02:00
Ulf Gebhardt	4b2bbe23b3	tripple timeout	2023-06-05 10:31:48 +02:00
Ulf Gebhardt	0812d9d992	properly include author of post aswell	2023-06-05 10:13:22 +02:00
dependabot[bot]	9c5fecb7b8	Bump metascraper-title from 5.33.5 to 5.34.7 in /backend ... Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.33.5 to 5.34.7. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.33.5...v5.34.7) --- updated-dependencies: - dependency-name: metascraper-title dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-05 08:08:21 +00:00
Ulf Gebhardt	5f2d771921	Merge pull request #6369 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/preset-env-7.22.4 ... Bump @babel/preset-env from 7.21.5 to 7.22.4 b2.6.0-429	2023-06-05 10:04:26 +02:00
mahula	8a8bfdfeac	Revert "update cypress related packageges in package.json" ... This reverts commit 59b61ef91851a6d2e75ff45f19eca262b2c47e2c.	2023-06-03 13:07:13 +02:00
mahula	a0c525b661	set back cypress-file-upload package version	2023-06-03 10:59:12 +02:00
mahula	7815194118	Merge branch 'master' into cypress-migrate-to-v10	2023-06-03 09:58:10 +02:00
mahula	59b61ef918	update cypress related packageges in package.json	2023-06-03 09:55:06 +02:00
mahula	ad1ee56064	fix reporting e2e tests	2023-06-03 07:14:59 +02:00
mahula	c218a550d2	linting	2023-06-03 06:05:16 +02:00
mahula	20ad70362a	fix social media test step	2023-06-03 06:00:53 +02:00
mahula	304d6bfb72	add cypresscondition to models index	2023-06-03 05:55:32 +02:00
dependabot[bot]	0102d347bd	Bump @babel/preset-env from 7.21.5 to 7.22.4 ... Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.21.5 to 7.22.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.22.4/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-03 01:57:23 +00:00
Ulf Gebhardt	01343a6544	fixed yarn lock	2023-06-03 03:50:02 +02:00
Ulf Gebhardt	b0121990ba	try using optionalAuthors	2023-06-03 03:48:41 +02:00
Ulf Gebhardt	8dbdcb4d19	we need to use sh instead of bash	2023-06-03 03:45:35 +02:00
Ulf Gebhardt	9b93b65f71	Merge branch 'master' into build-copy-files-script	2023-06-03 03:30:52 +02:00
Ulf Gebhardt	b3f6d58471	remove scripts folder from docker ignore list, convert script back to bash	2023-06-03 03:29:47 +02:00
Ulf Gebhardt	faffe08702	Merge branch 'master' into seed-posts-as-articles	2023-06-03 03:02:11 +02:00
Ulf Gebhardt	832763022d	also include author	2023-06-03 03:02:22 +02:00
mahula	a07e5f1bdb	add visit main page to logout e2e test	2023-06-02 22:10:05 +02:00
Moriz Wahl	ff41c04cf9	test RESET_POST_TYPE	2023-06-02 19:08:45 +02:00
Moriz Wahl	72ef3fe6f2	clone filter for toggle events ended	2023-06-02 18:52:49 +02:00
Moriz Wahl	d3a694e6e7	watch posts filters, to ensure that hasMore is reset to true	2023-06-02 18:45:02 +02:00
Moriz Wahl	5389b607db	even closer to master	2023-06-02 18:27:23 +02:00
Moriz Wahl	fdf4eb6bdc	get closer to master	2023-06-02 18:25:13 +02:00
Moriz Wahl	0b4e309611	Merge branch 'master' into alternate-solution-filter-order-post-types	2023-06-02 18:13:58 +02:00
Moriz Wahl	5ad7dac1fe	use filterdPostTypes getter	2023-06-02 18:11:18 +02:00
Moriz Wahl	f252c76670	recover filteredPostTypes getter	2023-06-02 18:05:37 +02:00
Moriz Wahl	2ae6c350e1	get things working	2023-06-02 17:46:00 +02:00
Moriz Wahl	73f62212f8	refactor components for store changes	2023-06-02 16:55:52 +02:00
Moriz Wahl	ba80f14d8c	refactor store and store tests	2023-06-02 16:55:01 +02:00
Ulf Gebhardt	8c969c88bd	Merge pull request #6366 from Ocelot-Social-Community/fix-typescript-2 ... fix(other): typescript fix regarding dist/build folder 2 b2.6.0-428	2023-06-02 16:22:41 +02:00
Hannes Heine	166941f860	Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation	2023-06-02 15:47:14 +02:00
Ulf Gebhardt	57840fcc69	Merge branch 'master' into fix-typescript-2	2023-06-02 15:38:19 +02:00
Ulf Gebhardt	b6b1a62ffb	fix reference to dist folder when its build now	2023-06-02 15:34:35 +02:00
Ulf Gebhardt	2c71293414	Merge branch 'master' into fix-coverage	2023-06-02 14:56:58 +02:00
Ulf Gebhardt	cea248bdd9	Merge pull request #6365 from Ocelot-Social-Community/typescript-fix-build ... fix(backend): corrected path in branded images for backend build folder(former dist) b2.6.0-427	2023-06-02 13:57:20 +02:00
Ulf Gebhardt	e804ff52da	removed duplicate step defintion	2023-06-02 13:51:34 +02:00
Ulf Gebhardt	3ad8588d6f	fix .env loading	2023-06-02 13:44:43 +02:00
Ulf Gebhardt	810e1c085b	fix first errors	2023-06-02 13:15:06 +02:00