14828 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	33ecc4764e	linting	2023-07-18 10:54:27 +02:00
Ulf Gebhardt	ae2d6c7ad5	fix recipient selection	2023-07-18 10:52:18 +02:00
Ulf Gebhardt	d7aba44fbe	removed console log and fixed reloading of messages	2023-07-18 10:48:42 +02:00
Ulf Gebhardt	98cad5b568	changed order of room to lastMessageAt	2023-07-18 10:47:56 +02:00
mahula	63bf3a3071	set workflow not to fail while deleting cache	2023-07-18 10:31:56 +02:00
mahula	6b7047e604	set workflow not to fail while deleting cache	2023-07-18 10:25:12 +02:00
Markus	eafac6f2f6	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-18 09:15:50 +02:00
Ulf Gebhardt	2e7adb4eb3	Merge branch 'master' into chat-notifications2	2023-07-17 22:29:03 +02:00
Ulf Gebhardt	e1203a9794	Merge pull request #6584 from Ocelot-Social-Community/chat-notifications ... feat(backend): room count subscription	2023-07-17 21:15:40 +02:00
Moriz Wahl	dfd7107714	remove unused ubscription test, fix subscription params in test	2023-07-17 20:37:52 +02:00
Moriz Wahl	1d8e1cf251	Merge branch 'chat-notifications' of github.com:Ocelot-Social-Community/Ocelot-Social into chat-notifications	2023-07-17 19:52:56 +02:00
Moriz Wahl	4b2fae9a2c	do not await for mark messages as seen	2023-07-17 19:52:41 +02:00
Ulf Gebhardt	a7474a09d7	Merge branch 'master' into chat-notifications	2023-07-17 19:46:57 +02:00
Ulf Gebhardt	a2e8401476	Merge pull request #6587 from Ocelot-Social-Community/fix-profile-query ... fix(backend): profile query fix	2023-07-17 19:46:40 +02:00
Moriz Wahl	27fe3068e0	remove emacs fragment	2023-07-17 19:30:44 +02:00
Moriz Wahl	cad890ffcb	Merge branch 'chat-notifications' of github.com:Ocelot-Social-Community/Ocelot-Social into chat-notifications	2023-07-17 19:29:26 +02:00
Moriz Wahl	74af799217	unread room count in store	2023-07-17 19:28:56 +02:00
Moriz Wahl	0dcda35678	no console	2023-07-17 18:55:36 +02:00
Moriz Wahl	2eb94d91e1	no subscription on message query	2023-07-17 18:54:17 +02:00
Moriz Wahl	829ea5ee0c	Merge branch 'master' into chat-notifications	2023-07-17 18:37:28 +02:00
Moriz Wahl	fb1d540eb2	subscription send on message query	2023-07-17 18:35:10 +02:00
Moriz Wahl	846fe26091	some changes	2023-07-17 18:34:35 +02:00
Ulf Gebhardt	3a86c892b4	further query simplification	2023-07-17 18:27:00 +02:00
Ulf Gebhardt	c24a9a56c2	profile query fix to return the correct user avatar not the first found	2023-07-17 18:24:31 +02:00
Ulf Gebhardt	deb8394fe2	Merge branch 'master' into chat-notifications	2023-07-17 18:15:47 +02:00
Ulf Gebhardt	ae0b7f7629	Merge pull request #6567 from Ocelot-Social-Community/mark-messages-as-read ... feat(webapp): mark messages as seen	2023-07-17 18:15:32 +02:00
Moriz Wahl	887f2c9362	more subscription tests for create message	2023-07-17 17:42:45 +02:00
Moriz Wahl	ea28f4afeb	recipient user of message to send subscription, test subscription	2023-07-17 17:33:51 +02:00
Moriz Wahl	884ee1713c	unread room count query as function	2023-07-17 16:36:39 +02:00
mahula	2c39e8f8a2	Merge branch 'master' into 6376-refactor-cypress-upgrad-all-relevant-packages-to-current-versions	2023-07-17 16:22:14 +02:00
mahula	137a3f0d72	upgrade cypress-relates packages	2023-07-17 16:17:25 +02:00
Moriz Wahl	ec9d488b3c	Merge branch 'master' into mark-messages-as-read	2023-07-17 16:08:55 +02:00
Moriz Wahl	b1102f6e3e	only mark other users messages as seen	2023-07-17 16:07:12 +02:00
mahula	d584efa71f	Merge pull request #6555 from Ocelot-Social-Community/6534-chat-room-usertag ... feat(webapp): changed usertag in chat messages to user-slug	2023-07-17 16:01:18 +02:00
Ulf Gebhardt	45db186dfd	more merge errors	2023-07-17 16:00:08 +02:00
Ulf Gebhardt	27600f0e79	fix merge error	2023-07-17 15:59:32 +02:00
Moriz Wahl	edeb22e70c	room avatar is working (returns other users avatar image if present)	2023-07-17 15:58:46 +02:00
Ulf Gebhardt	94bb798d72	Merge branch 'master' into chat-notifications	2023-07-17 15:51:52 +02:00
Ulf Gebhardt	b8f0e1ef59	"fix" room avatar query	2023-07-17 15:23:34 +02:00
mahula	e1374c05ac	add cache deletion job to backend and webapp workflow files	2023-07-17 15:18:48 +02:00
mahula	045d139960	replace artefact upload by caching in webapp unit test job	2023-07-17 15:11:18 +02:00
Ulf Gebhardt	19e441b449	more changeset reduction	2023-07-17 15:06:37 +02:00
Ulf Gebhardt	4a9199229b	redurce changeset	2023-07-17 15:05:51 +02:00
mahula	69408007e7	replace artefact upload by caching in webapp build test job	2023-07-17 15:04:12 +02:00
Ulf Gebhardt	56060c6573	Merge branch 'master' into mark-messages-as-read	2023-07-17 15:04:02 +02:00
mahula	466f67445e	Merge branch 'master' into 6534-chat-room-usertag	2023-07-17 15:01:45 +02:00
Ulf Gebhardt	ced4996f47	implement chatMessageAdded subscription	2023-07-17 14:55:57 +02:00
mahula	77f37fc210	Merge pull request #6564 from Ocelot-Social-Community/new-room-properties ... feat(backend): more room properties	2023-07-17 14:47:13 +02:00
mahula	f7e8d85b5f	add webapp test worfkflow file to file filter	2023-07-17 14:29:35 +02:00
mahula	e44c3493e2	add backend test worfkflow file to file filter	2023-07-17 14:29:00 +02:00