2547 Commits

Author	SHA1	Message	Date
Hannes Heine	7f06d71f6a	Merge branch 'master' into 6443-refactor-create-post-page	2023-07-26 10:53:04 +02:00
Wolfgang Huß	d57e3aa0f3	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into fix-code-in-editor-component	2023-07-21 07:27:19 +02:00
Ulf Gebhardt	fbd2b08737	Merge branch 'master' into fix-security-subscriptions	2023-07-20 17:11:20 +02:00
Wolfgang Huß	cf8c224062	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6593-@all-mention-for-network-admins	2023-07-20 16:53:36 +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	604e1d8465	subscription roomCountUpdated security fix	2023-07-20 13:44:23 +02:00
Ulf Gebhardt	f7c381efd8	subscription chatMessageAdded security fix	2023-07-20 13:44:04 +02:00
Ulf Gebhardt	1b8b356432	notification subscription	2023-07-20 13:41:59 +02:00
Ulf Gebhardt	0bd7968272	Merge branch 'master' into 6592-chat-component-+-button-open-search	2023-07-20 13:39:42 +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
Hannes Heine	d13f6f0728	Merge branch 'master' into 3086-avoid-red-color-for-non-essential-things--new	2023-07-20 10:45:31 +02:00
Wolfgang Huß	858e3fdee8	Rename 'addRoom' to 'toggleUserSearch' in chat component	2023-07-20 10:40:04 +02:00
Markus	18f932f1b6	[refactor] fixed wrong title on edit post page	2023-07-20 10:15:39 +02:00
elweyn	6659238fa1	Add fetchRooms option & check null on content.	2023-07-20 10:15:15 +02:00
Hannes Heine	b881daef91	Merge branch 'master' into 6592-chat-component-+-button-open-search	2023-07-20 10:11:41 +02:00
Hannes Heine	abdd70128a	Merge branch 'master' into 6236-groups-highlighting	2023-07-20 06:43:57 +02:00
Hannes Heine	b126347aee	Merge branch 'master' into 6592-chat-component-+-button-open-search	2023-07-20 06:40:44 +02:00
Markus	a8f32cad75	Merge branch 'master' into 6443-refactor-create-post-page	2023-07-19 22:01:47 +02:00
Markus	fac30fd6e0	Merge branch 'master' into 6236-groups-highlighting	2023-07-19 22:00:11 +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
Wolfgang Huß	a114b8a12c	Give the chat plus button a function and show hide the user search	2023-07-19 14:07:10 +02:00
Hannes Heine	e4e365d90e	Merge branch 'master' into 6568-highlight-username-chat	2023-07-19 13:46:11 +02:00
Wolfgang Huß	5ecf6a7fee	Change cancel button in 'MySomethingList' from danger to green	2023-07-19 12:31:52 +02:00
Wolfgang Huß	6beb59b89c	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 3086-avoid-red-color-for-non-essential-things--new	2023-07-19 12:20:28 +02:00
Wolfgang Huß	9f8f2635ab	Fix linting	2023-07-19 12:19:45 +02:00
Ulf Gebhardt	779d564159	lint fixes	2023-07-19 11:53:13 +02:00
Ulf Gebhardt	24187bf8a9	increase unreadCount when receiving a message, fix problem with empty room	2023-07-19 11:45:36 +02:00
Ulf Gebhardt	f7dd605838	shorten room message, update room message when sending	2023-07-19 11:36:35 +02:00
Ulf Gebhardt	41cca4f4ec	lint	2023-07-19 10:42:21 +02:00
Ulf Gebhardt	961a260044	remove default avatar, allow refetch rooms, count down read messages, update lastMessage & lastMessageAt, ...	2023-07-19 10:39:54 +02:00