5766 Commits

Author	SHA1	Message	Date
Markus	eb67ef0ec7	Merge branch 'master' into 6500-refactor-filter-menu	2023-07-19 22:01:05 +02:00
Markus	fac30fd6e0	Merge branch 'master' into 6236-groups-highlighting	2023-07-19 22:00:11 +02:00
Markus	2286d91d50	Merge branch 'master' into 6236-groups-highlighting	2023-07-19 21:59:05 +02:00
Markus	b190c56b52	Merge branch 'master' into 6500-refactor-filter-menu	2023-07-19 21:57:46 +02:00
Markus	57cf245b71	fixed linting	2023-07-19 21:53:05 +02:00
Markus	084b14608d	updated CategoriesFilter tests	2023-07-19 21:47:26 +02:00
Markus	f927c13b86	[refactor] updated layout/ui of filter menu	2023-07-19 21:47:02 +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
Hannes Heine	0cad389725	Merge branch 'master' into fix-chat-behaviour	2023-07-19 11:52:43 +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
Markus	897794b0ee	[feature] changed seen checks for chat component	2023-07-19 11:06:05 +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
Markus	0bc19cf226	[fix] added usertag as allowed html tags, so user highlighting works for the chat	2023-07-19 10:15:56 +02:00
Markus	85e68795a3	[fix] all group related pages are now under one route, so link highlighting works	2023-07-19 10:09:04 +02:00
mahula	5ef6e9e47d	Merge branch 'master' into 6589-on-open-chat-room-page-close-or-on-change-profile-change-mini-chat	2023-07-19 08:14:30 +02:00
Wolfgang Huß	ef95f12339	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6589-on-open-chat-room-page-close-or-on-change-profile-change-mini-chat	2023-07-18 18:30:49 +02:00
Wolfgang Huß	b85d5345a0	Clean up	2023-07-18 18:30:03 +02:00
Wolfgang Huß	9157e14ded	Change small chat partner on click the chat button on different user profile	2023-07-18 18:21:05 +02:00
Wolfgang Huß	a3b3e02ebc	Use 'mapMutations' in default layout	2023-07-18 18:20:04 +02:00
Wolfgang Huß	c7deefa563	Close small chat if one changes to the chat room page	2023-07-18 17:33:45 +02:00
Ulf Gebhardt	f3fc9145d3	Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder	2023-07-18 15:56:51 +02:00
Ulf Gebhardt	f9dad608c7	Merge branch 'master' into chat-last-messages	2023-07-18 15:22:56 +02:00
Wolfgang Huß	cc4cb8af46	Rename tag 'chat-module' to 'chat'	2023-07-18 14:41:10 +02:00
Wolfgang Huß	785a027989	Close mini chat on visit chat room page	2023-07-18 14:17:40 +02:00
Wolfgang Huß	96f8f7efda	Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder	2023-07-18 14:13:51 +02:00
Moriz Wahl	342d60d21f	Merge branch 'chat-notifications2' of github.com:Ocelot-Social-Community/Ocelot-Social into chat-notifications2	2023-07-18 13:23:13 +02:00
Ulf Gebhardt	e47a558c80	Merge branch 'master' into chat-notifications2	2023-07-18 12:54:38 +02:00
Moriz Wahl	81a08ff04e	query all props on add message subscription	2023-07-18 12:47:23 +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ß	0b96388a42	Remove '*.js' on imports in 'Editor.vue'	2023-07-18 11:47:05 +02:00
Wolfgang Huß	1bc7472068	Merge branch 'master' into 6545-add-headline-to-chat-page	2023-07-18 11:40:25 +02:00
Ulf Gebhardt	cca020b6b3	aligned backend and frontend queries, show last message and unread count in room list	2023-07-18 11:14:06 +02:00