14169 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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
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
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
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
Moriz Wahl	c05d39f4e6	Merge branch 'master' into new-room-properties	2023-07-17 14:11:33 +02:00
mahula	528a76a6cf	Merge pull request #6562 from Ocelot-Social-Community/chat-order-by-indexid ... refactor(backend): chat messages - order by indexId instead of createdAt	2023-07-17 14:10:38 +02:00
mahula	58e25e6361	Merge branch 'master' into chat-order-by-indexid	2023-07-17 13:36:52 +02:00
mahula	c543b7d478	Merge pull request #6560 from Ocelot-Social-Community/6557-chat-reactive-language-switch ... feat(webapp): chat language is reactive	2023-07-17 13:32:46 +02:00
Ulf Gebhardt	e09c91235e	properly propagte user into unreadRoomCount subscription	2023-07-17 13:11:33 +02:00
Moriz Wahl	1ac3553200	Merge branch 'master' into new-room-properties	2023-07-17 13:06:35 +02:00
mahula	28596b2db3	Merge branch 'master' into 6557-chat-reactive-language-switch	2023-07-17 12:58:30 +02:00
mahula	7198122ebf	Merge pull request #6566 from Ocelot-Social-Community/unread-rooms-query ... feat(backend): unread rooms query	2023-07-17 12:57:48 +02:00
Ulf Gebhardt	3e60ab6854	room count subscription	2023-07-17 12:41:06 +02:00
Moriz Wahl	edaf72b674	add room query pagination	2023-07-17 11:56:58 +02:00
Moriz Wahl	590819a7a4	Merge branch 'master' into new-room-properties	2023-07-17 11:54:12 +02:00
Moriz Wahl	4afd688fbe	count unread messages on create room	2023-07-17 11:50:59 +02:00
Ulf Gebhardt	fb45ac107a	Merge branch 'unread-rooms-query' into chat-notifications	2023-07-17 11:49:51 +02:00
Ulf Gebhardt	ec07ddfec2	Merge branch 'master' into unread-rooms-query	2023-07-17 11:44:45 +02:00
Ulf Gebhardt	882435e54c	lint fix	2023-07-17 11:40:07 +02:00
Ulf Gebhardt	9c052ea1cd	start with chat notifications	2023-07-17 11:38:06 +02:00
Moriz Wahl	8e3402a7ef	Update backend/src/schema/types/type/Room.gql ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-07-17 11:33:59 +02:00
Ulf Gebhardt	32eff1eab2	Merge pull request #6580 from Ocelot-Social-Community/chat-last-seen-webapp ... feat(webapp): chat last seen in webapp	2023-07-17 10:54:41 +02:00
Ulf Gebhardt	d75566a8ce	sender user	2023-07-17 10:30:12 +02:00
Ulf Gebhardt	b6fe28e1c4	fix test, test pagination properly	2023-07-17 10:29:32 +02:00
Ulf Gebhardt	1e77e9aec0	Merge branch 'master' into unread-rooms-query	2023-07-17 10:23:56 +02:00
Ulf Gebhardt	9ab8fd7561	Merge branch 'master' into chat-last-seen-webapp	2023-07-17 10:10:14 +02:00
Ulf Gebhardt	640e713f0a	Merge pull request #6579 from Ocelot-Social-Community/chat-pagniate-rooms ... feat(webapp): chat paginate rooms	2023-07-17 10:09:05 +02:00
Ulf Gebhardt	348d56beb1	Merge branch 'master' into chat-pagniate-rooms	2023-07-17 09:33:39 +02:00
Hannes Heine	57418ee18a	Merge pull request #6582 from Ocelot-Social-Community/share-required-files-via-cache-for-e2e-testing ... refactor(other): use cached docker images in github e2e flow to decrease run time of e2e test job runs	2023-07-17 09:32:01 +02:00
Ulf Gebhardt	121093342b	Merge branch 'master' into chat-pagniate-rooms	2023-07-17 09:30:02 +02:00
mahula	6ab1d24c36	remove pr number step fpm e2e test job	2023-07-17 07:47:49 +02:00
mahula	fe8d4a4cfa	reuse pr number from preparation step in e2e test step	2023-07-17 07:46:01 +02:00
mahula	545eb04d6c	adapt step namings	2023-07-17 07:43:54 +02:00