14279 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Hannes Heine	e419e247b6	Merge pull request #6609 from Ocelot-Social-Community/6568-highlight-username-chat ... fix(webapp): highlight username functionality for chat b2.7.0-511	2023-07-19 14:14:24 +02:00
Hannes Heine	e4e365d90e	Merge branch 'master' into 6568-highlight-username-chat	2023-07-19 13:46:11 +02:00
Ulf Gebhardt	b1e39585b1	Merge pull request #6611 from Ocelot-Social-Community/fix-chat-behaviour ... fix(webapp): fix chat behaviour b2.7.0-510	2023-07-19 12:31:25 +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 b2.7.0-509	2023-07-19 11:52:08 +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 b2.7.0-508	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` b2.7.0-507	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) b2.7.0-506	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 b2.7.0-505	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
mahula	f348e18ce2	Revert "make workflows fail to stress test github cache deletion" ... This reverts commit 09e887fc3c86e21258d7e697daae68c292ddb4d8.	2023-07-18 22:54:14 +02:00
mahula	09e887fc3c	make workflows fail to stress test github cache deletion	2023-07-18 22:32:21 +02:00
mahula	2eb507170a	Revert "make e2e testing fail for testing" ... This reverts commit d0a597b07d1b53da2f9210e45ba1998046a4db46.	2023-07-18 21:59:22 +02:00
Markus	1f64d7dbc3	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-18 21:48:19 +02:00
mahula	7f5730edc8	fix typo	2023-07-18 21:37:26 +02:00
mahula	d0a597b07d	make e2e testing fail for testing	2023-07-18 21:12:31 +02:00
mahula	b4383d38a1	set e2e test cache delete job wo run only, if needed jobs were successful	2023-07-18 21:10:54 +02:00
mahula	715ab9d0cb	set webapp cache delete job wo run only, if needed jobs were successful	2023-07-18 21:06:00 +02:00
mahula	b712e3084e	Revert "make backend tests fail for testing" ... This reverts commit 991e5c5ec30338e1e93c5bf17c8d94f7d06a9dd1.	2023-07-18 20:26:09 +02:00
mahula	0e73d53e9a	fix typo	2023-07-18 19:57:37 +02:00
mahula	991e5c5ec3	make backend tests fail for testing	2023-07-18 19:55:27 +02:00
mahula	ca721228cd	change backend cache deletion job dependency	2023-07-18 19:41:24 +02:00
mahula	b2632e3a88	for testing use only backend test workflow triggered by pushes on this branch	2023-07-18 19:34:36 +02:00
mahula	d468af8104	fix cache naming	2023-07-18 19:18:38 +02:00
Ulf Gebhardt	b1feca35d6	another try fixing run id	2023-07-18 18:55:07 +02:00
mahula	4d61163868	run cache deletion job only, if file change condition is true	2023-07-18 18:42:03 +02:00
mahula	bf7d4e13c8	run cache deletion job only, if needed jobs were successful	2023-07-18 18:42:03 +02:00
Ulf Gebhardt	6ccd4dde54	reference GITHUB_RUN_NUMBER differently	2023-07-18 18:34:13 +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
Ulf Gebhardt	45c70f7910	corrected var reference	2023-07-18 17:55:22 +02:00
Ulf Gebhardt	a9835288e2	fix github cache in workflow	2023-07-18 17:39:50 +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	4a474a6a4a	convert indexId to string (neo4j number problem)	2023-07-18 16:35:18 +02:00