14305 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	b126347aee	Merge branch 'master' into 6592-chat-component-+-button-open-search	2023-07-20 06:40:44 +02:00
Hannes Heine	052d59b3b6	Merge pull request #6617 from Ocelot-Social-Community/6588-chat-link-to-chat-page ... feat(webapp): chat link to chat page	2023-07-20 06:39:28 +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
Hannes Heine	d23eb77d3a	Merge pull request #6615 from Ocelot-Social-Community/fix-chat-last-message-check ... fix(webapp): fix lastMessage to contain proper values	2023-07-19 16:23:50 +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
Hannes Heine	9ba8492503	Merge branch 'master' into fix-chat-last-message-check	2023-07-19 15:47:14 +02:00
Hannes Heine	6c31a6f51c	Merge pull request #6613 from Ocelot-Social-Community/chat-trim-message ... fix(backend): chat create message - only take 2000 chat message characters	2023-07-19 15:46:11 +02:00
Ulf Gebhardt	ea368cd0f3	lint fixes	2023-07-19 15:09:13 +02:00
Hannes Heine	ff9db84cba	Merge branch 'master' into chat-trim-message	2023-07-19 15:02:29 +02:00
Hannes Heine	7d4e4071e0	Merge pull request #6614 from Ocelot-Social-Community/6590-chat-send-url ... feat(webapp): chat component can now show clickable urls	2023-07-19 15:01:49 +02:00
Ulf Gebhardt	2f76d0b502	fix lastMessage to contain proper values	2023-07-19 14:38:23 +02:00
Ulf Gebhardt	0234244c09	Merge branch 'master' into 6590-chat-send-url	2023-07-19 14:21:49 +02:00
Ulf Gebhardt	bc1015da8c	corrected field names to exclude, remove comment	2023-07-19 14:22:04 +02:00
Hannes Heine	e419e247b6	Merge pull request #6609 from Ocelot-Social-Community/6568-highlight-username-chat ... fix(webapp): highlight username functionality for chat	2023-07-19 14:14:24 +02:00
Ulf Gebhardt	4448ecd6fe	fix walk recursive & field definitions	2023-07-19 14:12:45 +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
Hannes Heine	5c62a23254	Merge branch 'master' into 6590-chat-send-url	2023-07-19 12:32:14 +02:00
Ulf Gebhardt	b1e39585b1	Merge pull request #6611 from Ocelot-Social-Community/fix-chat-behaviour ... fix(webapp): fix chat behaviour	2023-07-19 12:31:25 +02:00
Markus	332340ed07	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-19 12:17:08 +02:00
Ulf Gebhardt	256bcc2af7	do not filter chat message content with xss-middleware	2023-07-19 12:13:49 +02:00
Ulf Gebhardt	6acdde177f	Revert "[feature] chat component can now show clickable urls" ... This reverts commit 02cbe6c19b4c4d676094f849cd05a740feb2360a.	2023-07-19 12:13:18 +02:00
Markus	02cbe6c19b	[feature] chat component can now show clickable urls	2023-07-19 11:56:38 +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
Hannes Heine	5ebc73670e	Merge pull request #6612 from Ocelot-Social-Community/6583-chat-seen-check-style ... feat(webapp): chat seen check style	2023-07-19 11:52:08 +02:00
Ulf Gebhardt	93aaea4aa1	only take 2000 chat message characters	2023-07-19 11:51:41 +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	7dbae3f5c4	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-19 09:49:23 +02:00
Wolfgang Huß	c2655867c9	Merge pull request #6605 from Ocelot-Social-Community/6589-on-open-chat-room-page-close-or-on-change-profile-change-mini-chat ... feat(webapp): on open chat room page close or on change profile and click chat change small chat	2023-07-19 09:10:03 +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
Hannes Heine	d3519eedc2	Merge pull request #6601 from Ocelot-Social-Community/6591-chat-room-list-search-bar-placeholder ... feat(webapp): change text for chat room search to `Filter chat rooms`	2023-07-19 08:12:42 +02:00
Hannes Heine	7b490e2f34	Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder	2023-07-19 07:37:32 +02:00
Hannes Heine	219c035a88	Merge pull request #6603 from Ocelot-Social-Community/fix-chat-message-socket ... fix(backend): convert indexId to string (neo4j number problem)	2023-07-19 07:37:08 +02:00
Hannes Heine	4018137583	Merge branch 'master' into fix-chat-message-socket	2023-07-19 07:06:59 +02:00
Hannes Heine	4d703586f4	Merge pull request #6604 from Ocelot-Social-Community/fix-runner ... fix(other): github cache in workflow	2023-07-19 07:06:28 +02:00
mahula	aa7c54a052	set back workflow triggers to push	2023-07-18 23:59:34 +02:00
mahula	3ffa8c9af5	add recommended branch cache cleanup at pr closing workflow	2023-07-18 23:37:44 +02:00