13785 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	09060f52fb	Merge pull request #6414 from Ocelot-Social-Community/dependabot/npm_and_yarn/cypress-12.14.0 ... Bump cypress from 12.13.0 to 12.14.0 b2.7.0-448	2023-06-17 11:21:32 +02:00
dependabot[bot]	e8dcba6074	Bump cypress from 12.13.0 to 12.14.0 ... Bumps [cypress](https://github.com/cypress-io/cypress) from 12.13.0 to 12.14.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v12.13.0...v12.14.0) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-17 00:27:49 +00:00
Ulf Gebhardt	841f8fbe63	Merge pull request #6409 from Ocelot-Social-Community/dependabot/docker/backend/node-20.3.0-alpine3.17 ... Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend b2.7.0-447	2023-06-17 02:25:08 +02:00
dependabot[bot]	22d7116e4b	Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend ... Bumps node from 20.2.0-alpine3.17 to 20.3.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-06-16 22:53:48 +00:00
Ulf Gebhardt	8dd5345d8c	Merge pull request #6408 from Ocelot-Social-Community/dependabot/docker/webapp/node-20.3.0-alpine3.17 ... Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /webapp b2.7.0-446	2023-06-17 00:52:55 +02:00
dependabot[bot]	12af4c23b2	Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /webapp ... Bumps node from 20.2.0-alpine3.17 to 20.3.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-06-16 21:45:06 +00:00
Ulf Gebhardt	75bd7dbc36	fixed report queries	2023-06-16 23:00:59 +02:00
Ulf Gebhardt	df139c9937	use list comprehension instead of filter(not supported anymore in 4.4)	2023-06-16 15:34:27 +02:00
Ulf Gebhardt	eb6825b6e6	remove listen address 7474 from docker since its default value	2023-06-16 15:14:27 +02:00
Ulf Gebhardt	23c2be3093	Merge branch 'master' into update-database	2023-06-16 15:02:58 +02:00
Moriz Wahl	c68339fedf	roomName property	2023-06-16 13:07:10 +02:00
Moriz Wahl	cd23b88dd6	room users complete	2023-06-16 12:53:48 +02:00
Moriz Wahl	6a6efd5a23	override user._id with user.id to not expose internal db id	2023-06-16 12:38:13 +02:00
Moriz Wahl	64120a0009	_id property for user	2023-06-16 09:13:29 +02:00
Moriz Wahl	5d4c4f3c98	roomId property	2023-06-16 09:08:31 +02:00
Moriz Wahl	90bf1881f7	message query is working	2023-06-15 16:45:38 +02:00
Moriz Wahl	610d538ca9	message query is not working as expected	2023-06-15 16:26:55 +02:00
Ulf Gebhardt	e657b8bf7d	Merge pull request #6448 from Ocelot-Social-Community/typescript-fix ... fix(backend): typescript fix b2.7.0-445	2023-06-15 14:33:41 +02:00
Ulf Gebhardt	c1669abac0	correct nodemon watch in dev:debug	2023-06-15 13:58:38 +02:00
Ulf Gebhardt	5dd4a1af80	comment to explain the bug	2023-06-15 13:58:26 +02:00
Ulf Gebhardt	09ef532838	converted two more js files to ts	2023-06-15 13:57:29 +02:00
Ulf Gebhardt	0432d3277e	fixed why production didnt work	2023-06-15 13:57:13 +02:00
Moriz Wahl	0e4cf0ecef	Merge branch 'master' into rooms	2023-06-15 10:44:41 +02:00
Ulf Gebhardt	a43a4b2c5d	Merge pull request #6434 from Ocelot-Social-Community/ts-all ... refactor(backend): migrate completely to typescript b2.7.0-444	2023-06-15 01:38:48 +02:00
Moriz Wahl	d2beca22c9	set up unit tests for messages	2023-06-14 17:27:42 +02:00
Moriz Wahl	ae131cc656	add permissions for messages	2023-06-14 16:15:28 +02:00
Moriz Wahl	bb8a745566	simple message create mutation and query	2023-06-14 16:14:19 +02:00
Moriz Wahl	5b859bbcb5	test roomms resolver	2023-06-14 15:38:05 +02:00
Moriz Wahl	a51f357357	filter that only the rooms of the current user are returned	2023-06-14 15:00:23 +02:00
Wolfgang Huß	82c6babc84	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6439-fix-terms-and-condition+data-privacy-links-on-registration	2023-06-14 13:26:39 +02:00
Wolfgang Huß	53d3a921bf	Force target '_blank' in registration 'terms and conditions', 'data privacy' links by 'PageParamsLink'	2023-06-14 13:20:56 +02:00
Moriz Wahl	fc50d69bff	simple room query	2023-06-14 12:47:00 +02:00
Moriz Wahl	8b037ffa73	fix room properties	2023-06-14 12:16:44 +02:00
Moriz Wahl	d548fc2b84	simple create room mutation	2023-06-14 12:09:52 +02:00
Wolfgang Huß	c5ec22a6f2	Change registration 'term and conditions', 'data privacy' link to use 'PageParamsLink' that external pages can be used	2023-06-14 12:08:36 +02:00
Ulf Gebhardt	8229be36b2	Merge branch 'master' into ts-all	2023-06-14 11:21:21 +02:00
Hannes Heine	2904f95b1a	Merge pull request #6440 from Ocelot-Social-Community/release-2.7.0 ... chore(release): v2.7.0 b2.7.0-443 2.7.0	2023-06-14 10:45:32 +02:00
elweyn	de3c2faa58	chore(other): create new tag 2.7.0	2023-06-14 10:06:13 +02:00
Ulf Gebhardt	6b29472872	typo	2023-06-13 17:27:02 +02:00
Ulf Gebhardt	4b0904fa1b	do not allow js	2023-06-13 17:25:24 +02:00
Ulf Gebhardt	325d45f690	remove scripts not part of this	2023-06-13 17:20:11 +02:00
Ulf Gebhardt	4f033efaa7	fixed wrong removal of .js	2023-06-13 17:16:11 +02:00
Ulf Gebhardt	9baab693fc	fix spacing	2023-06-13 17:11:39 +02:00
Ulf Gebhardt	5feeab9182	fixed typescript error on embeds.spec	2023-06-13 16:56:00 +02:00
Ulf Gebhardt	d60b2e1544	type for mockedFetch	2023-06-13 16:22:57 +02:00
Ulf Gebhardt	79a5db809b	build backend for fullstack tests	2023-06-13 15:32:14 +02:00
Ulf Gebhardt	5f545f3b8f	fixed cypress	2023-06-13 15:06:04 +02:00
Ulf Gebhardt	3f7f3c2651	"fix" decoder	2023-06-13 14:22:25 +02:00
Ulf Gebhardt	73d0cc4a1c	fix several tests to fit typescript requirements	2023-06-13 14:07:59 +02:00
Ulf Gebhardt	e8cc3b3766	ts-jest & jest types	2023-06-13 13:02:37 +02:00