13341 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ulf Gebhardt	8c969c88bd	Merge pull request #6366 from Ocelot-Social-Community/fix-typescript-2 ... fix(other): typescript fix regarding dist/build folder 2	2023-06-02 16:22:41 +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	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)	2023-06-02 13:57:20 +02:00
Ulf Gebhardt	ac087edcb8	include posttype in cypher query	2023-06-02 13:13:06 +02:00
Ulf Gebhardt	1b484b1e3e	corrected path in braded images for backend build folder(former dist)	2023-06-02 12:40:02 +02:00
Wolfgang Huß	e004afc9c5	Merge pull request #6331 from Ocelot-Social-Community/6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0 ... chore(other): upgrade node version in '.nvmrc' files to v20.2.0	2023-06-02 11:50:40 +02:00
Ulf Gebhardt	733a88bb26	try to fix result if promise resolves to null or invalid	2023-06-02 11:42:15 +02:00
Ulf Gebhardt	d08a78b685	Merge branch 'master' into seed-posts-as-articles	2023-06-02 11:12:56 +02:00
Wolfgang Huß	779a23588a	Merge branch 'master' into 6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0	2023-06-02 11:05:54 +02:00
Ulf Gebhardt	1b92bb60b3	Merge pull request #6321 from Ocelot-Social-Community/typescript ... feat(backend): typescript	2023-06-02 10:52:10 +02:00
Ulf Gebhardt	d2a44c8753	Merge branch 'master' into typescript	2023-06-02 10:16:01 +02:00
entermex	a4f84b0a4c	Merge pull request #6319 from Ocelot-Social-Community/6307-group-list-number-to-six ... fix(webapp): fix group list number to six	2023-06-01 23:29:06 +02:00
entermex	9176cbfe80	Merge branch 'master' into 6307-group-list-number-to-six	2023-06-01 22:50:46 +02:00
entermex	691226e3f3	Merge pull request #6335 from Ocelot-Social-Community/6290-fix-notification-menu-comment-hash ... fix(webapp): fix notification menu comment hash	2023-06-01 22:50:13 +02:00
entermex	e11b4eb28e	Merge branch 'master' into 6290-fix-notification-menu-comment-hash	2023-06-01 22:19:44 +02:00
Ulf Gebhardt	3bcd518bd4	reverted removal of data:null	2023-05-31 10:32:40 +02:00
Ulf Gebhardt	a21df08551	revered removal of data: null	2023-05-31 10:28:28 +02:00
Ulf Gebhardt	a50e3f2f14	Merge branch 'master' into typescript	2023-05-31 10:21:04 +02:00
Ulf Gebhardt	3790f3d010	Merge pull request #6199 from Ocelot-Social-Community/event-master ... feat(other): 🍰 epic events – master	2023-05-30 16:28:29 +02:00
Hannes Heine	9a9f5eaf45	Merge branch 'master' into event-master	2023-05-30 15:26:22 +02:00
Ulf Gebhardt	a72ce57d12	Merge pull request #6260 from Ocelot-Social-Community/fix-avatar-seeding ... fix(other): fix avatar seeding	2023-05-30 14:05:50 +02:00
Wolfgang Huß	e090611efa	Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-30 10:53:53 +02:00
Wolfgang Huß	54c7f9e38d	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master	2023-05-30 10:53:20 +02:00
mahula	7b0322434a	Merge branch 'master' into fix-avatar-seeding	2023-05-30 10:11:29 +02:00
mahula	eecdb66024	refine interception assertion	2023-05-27 14:06:28 +02:00
mahula	56e61db444	refine interception assertion	2023-05-27 13:50:26 +02:00
mahula	9e5925f82c	clean up	2023-05-27 13:49:44 +02:00
mahula	2fa8be30c5	add network interception to e2e test step	2023-05-27 12:26:32 +02:00
mahula	3a79884db3	add network interception to e2e test step	2023-05-27 10:13:24 +02:00
mahula	7576347658	deactivate video recording and upload in e2e test workflow	2023-05-27 09:16:06 +02:00
mahula	14ed84620b	add network waiting to several cypress steps	2023-05-26 17:28:04 +02:00
mahula	a5eca59f88	fix typo	2023-05-26 13:38:44 +02:00
mahula	7528d32dfc	add network interception to cypress test	2023-05-26 13:36:35 +02:00
mahula	0e046e222c	add network interception to cypress test	2023-05-26 12:53:18 +02:00
mahula	18288efa1b	wait for network to be idle in cypress tests	2023-05-26 11:16:58 +02:00
mahula	b2b9ebc400	wait for network to be idle in cypress tests	2023-05-26 10:47:35 +02:00
mahula	8b4c176c29	add waiting to preparation step	2023-05-26 09:18:43 +02:00
mahula	48a88a17c3	add waiting to preparation step	2023-05-26 08:18:28 +02:00
mahula	eeb1e7dd36	increase cypress page load timeout	2023-05-25 15:02:31 +02:00
Wolfgang Huß	eac46dd6c8	Merge pull request #6333 from Ocelot-Social-Community/6332-enable-gql-playground-set-DEBUG=true-in-backend-env ... chore(other): set 'DEBUG=true' in backend '.env.template' to use GraphQL Playground	2023-05-25 14:41:14 +02:00
mahula	edb9618b1f	increase cypress page load timeout	2023-05-25 14:25:07 +02:00
Wolfgang Huß	baf860c5c9	Merge branch 'master' into 6332-enable-gql-playground-set-DEBUG=true-in-backend-env	2023-05-25 14:14:50 +02:00
Ulf Gebhardt	9667641e42	Merge branch 'master' into fix-avatar-seeding	2023-05-25 13:47:32 +02:00
Ulf Gebhardt	6c6e308cc7	Merge pull request #6326 from Ocelot-Social-Community/unused-packages-ocelot ... refactor(other): unused packages ocelot	2023-05-25 13:47:11 +02:00
mahula	433111604d	set cypress to test only a specific feature and record a video for debugging	2023-05-25 13:30:24 +02:00
mahula	2cfd6d57df	set cypress to test only a specific feature and record a video for debugging	2023-05-25 13:28:06 +02:00
mahula	648ee8178c	set cypress to test only a specific feature and record a video for debugging	2023-05-25 13:24:52 +02:00