121 Commits

Author	SHA1	Message	Date
elweyn	6a3ff9e8c4	Merge master	2023-12-12 18:01:36 +01:00
elweyn	1f74846ab1	Lint fix.	2023-12-12 17:48:41 +01:00
entermex	bd688ecd6b	Fix: proxyApiUrl in chat rooms for the avatars	2023-08-18 11:43:28 +02:00
Wolfgang Huß	d345bf0bba	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6669-fix-having-wrong-chat-font-as-default-in-network	2023-08-11 12:34:42 +02:00
Wolfgang Huß	5b954197dc	Remove font 'Quicksand' from the chat ... - Set style of chat component to 'scoped'	2023-08-11 12:27:21 +02:00
Wolfgang Huß	2c123313ed	Fix 'm.avatar is null' error message	2023-08-11 11:14:47 +02:00
Ulf Gebhardt	7e697d7f9d	lint fixes	2023-08-08 22:22:11 +02:00
Ulf Gebhardt	5c1ab88012	conditional url replacement	2023-08-08 22:21:24 +02:00
elweyn	b591820eb6	Fix avatar in Room.	2023-08-08 07:56:02 +02:00
Ulf Gebhardt	6f43321aba	try to fix avatars	2023-08-07 15:56:56 +02:00
Markus	f1fc2e07f7	fixed linting	2023-07-28 14:36:32 +02:00
Markus	9849a13999	[fix] @ mentions in chat now redirect to user page	2023-07-28 14:35:43 +02:00
elweyn	a28b658674	Merge branch 'master' into refactor-chat-module	2023-07-27 09:56:44 +02:00
elweyn	993442a754	Prepare Chat mount of Chat Component.	2023-07-27 08:31:17 +02:00
elweyn	d07dbe14a9	Change click event layer from div to button.	2023-07-26 14:21:05 +02:00
elweyn	ad74448696	Fix linting.	2023-07-26 14:00:59 +02:00
elweyn	790ce71122	Change the button style to small, change position.	2023-07-26 13:43:51 +02:00
elweyn	618e4c7a67	Change icons to base-buttons	2023-07-26 12:59:25 +02:00
elweyn	2ca7319fca	First unit test setup.	2023-07-26 10:54:55 +02:00
elweyn	2c29437912	Refactor messages and rooms query.	2023-07-25 16:39:43 +02:00
elweyn	4d7319fac4	Remove console.logs.	2023-07-25 11:34:34 +02:00
elweyn	761964acbd	Refactor chat module. ... Co-authored-by: Mogge <moriz.wahl@gmx.de>	2023-07-25 11:33:32 +02:00
Ulf Gebhardt	fbd2b08737	Merge branch 'master' into fix-security-subscriptions	2023-07-20 17:11:20 +02:00
Wolfgang Huß	b26e454562	Fix linting	2023-07-20 15:42:40 +02:00
elweyn	074711dd90	Fix: order createdAt_desc & lastMessageAt_desc	2023-07-20 14:31:57 +02:00
elweyn	21124bcd71	Fix: Order of rooms.	2023-07-20 14:18:25 +02:00
Ulf Gebhardt	f7c381efd8	subscription chatMessageAdded security fix	2023-07-20 13:44:04 +02:00
Ulf Gebhardt	70a1c52165	lint fixes	2023-07-20 13:10:25 +02:00
Ulf Gebhardt	01fb28da3c	unify function to fix room result, propose order fix(not 100%)	2023-07-20 13:09:38 +02:00
Ulf Gebhardt	624f379677	fix new room mechanic	2023-07-20 12:57:18 +02:00
elweyn	0b64fce5aa	Add selectedRoom equaling the createdRoom	2023-07-20 12:19:32 +02:00
Wolfgang Huß	883d7d89ab	Fix linting	2023-07-20 12:04:37 +02:00
Wolfgang Huß	dee77df5f6	Cleanup	2023-07-20 12:02:24 +02:00
elweyn	13da3ba3f4	Add returned properties to the CreateRoom mutation, add emit to change the roomID.	2023-07-20 11:35:06 +02:00
elweyn	a82d245f63	Change toast error to error.message.	2023-07-20 11:03:20 +02:00
elweyn	b76802f59f	Add close button and style the headline of the UserSearch.	2023-07-20 11:01:18 +02:00
Wolfgang Huß	858e3fdee8	Rename 'addRoom' to 'toggleUserSearch' in chat component	2023-07-20 10:40:04 +02:00
elweyn	6659238fa1	Add fetchRooms option & check null on content.	2023-07-20 10:15:15 +02:00
Hannes Heine	b126347aee	Merge branch 'master' into 6592-chat-component-+-button-open-search	2023-07-20 06:40:44 +02:00
Wolfgang Huß	20e6fb5122	Change headline for search user for new chat on chat page	2023-07-19 17:59:20 +02:00
Wolfgang Huß	4192612293	Fix linting	2023-07-19 17:51:05 +02:00
Wolfgang Huß	3d9a9cd5a0	Create the chat room on user search in chats function	2023-07-19 17:47:56 +02:00
Markus	74dceb82f0	Merge branch '6588-chat-link-to-chat-page' of github.com:Ocelot-Social-Community/Ocelot-Social into 6588-chat-link-to-chat-page	2023-07-19 17:27:05 +02:00
Markus	45dba25a7a	[fix] changed css rule for single chat icon	2023-07-19 17:24:37 +02:00
Wolfgang Huß	26282c67b7	Make user search in chats function – second step	2023-07-19 16:41:23 +02:00
Hannes Heine	e87078c2fc	Merge branch 'master' into 6588-chat-link-to-chat-page	2023-07-19 16:25:01 +02:00
Markus	5bae7cbd94	[feature] open chat page via link from single chat window and open the used room after loading	2023-07-19 15:54:31 +02:00
Wolfgang Huß	ffe51a0743	Separate 'ds-select' of 'AddGroupMember' into separate component 'SelectUserSearch'	2023-07-19 15:48:05 +02:00
Ulf Gebhardt	ea368cd0f3	lint fixes	2023-07-19 15:09:13 +02:00
Ulf Gebhardt	2f76d0b502	fix lastMessage to contain proper values	2023-07-19 14:38:23 +02:00