14194 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wolfgang Huß	96f8f7efda	Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder	2023-07-18 14:13:51 +02:00
Ulf Gebhardt	53cfbd0da1	Merge pull request #6599 from Ocelot-Social-Community/seed-no-promise-all ... refactor(backend): removed promise all from seed	2023-07-18 13:27:53 +02:00
Ulf Gebhardt	b908bb3b85	Merge branch 'master' into seed-no-promise-all	2023-07-18 12:53:31 +02:00
Ulf Gebhardt	eabef4c56c	Merge pull request #6563 from Ocelot-Social-Community/6545-add-headline-to-chat-page ... feat(webapp): add headline to chat page	2023-07-18 12:53:03 +02:00
Ulf Gebhardt	507f0c0880	removed promise all	2023-07-18 12:23:24 +02:00
Wolfgang Huß	1cc60cd154	Change text for chat room search to 'Filter chat rooms'	2023-07-18 12:23:09 +02:00
Wolfgang Huß	1bc7472068	Merge branch 'master' into 6545-add-headline-to-chat-page	2023-07-18 11:40:25 +02:00
Hannes Heine	61ecb448bb	Merge pull request #6594 from Ocelot-Social-Community/set-cache-cleanup-not-to-fail ... fix(other): set workflow not to fail while deleting cache	2023-07-18 11:23:58 +02:00
mahula	63bf3a3071	set workflow not to fail while deleting cache	2023-07-18 10:31:56 +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
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