ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,556 Commits 117 Branches 1,511 Tags
Commit Graph

14556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
1b8b356432
notification subscription 2023-07-20 13:41:59 +02:00
elweyn
2decf90b6b Change the background color of my messages to the same color as the one in side menu. 2023-07-20 13:40:29 +02:00
Ulf Gebhardt
0bd7968272
Merge branch 'master' into 6592-chat-component-+-button-open-search 2023-07-20 13:39:42 +02:00
Hannes Heine
0b1e377df5
Merge pull request #6565 from Ocelot-Social-Community/3086-avoid-red-color-for-non-essential-things--new 
feat(webapp): change color red to green on cancel buttons of post and comments
b2.7.0-517 		2023-07-20 13:27:53 +02:00
Ulf Gebhardt
e2c23ad4a2
more lint fixes 2023-07-20 13:10:32 +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
Wolfgang Huß
999255b2b5 Change general search hint 2023-07-20 12:38:43 +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
Markus
daaff73c73 fixed linting 2023-07-20 10:09:28 +02:00
Markus
c9f51ffca9 [refactor] filter menu further feedback implementation 2023-07-20 10:07:59 +02:00
Hannes Heine
9e52ec5469
Merge pull request #6608 from Ocelot-Social-Community/6236-groups-highlighting 
fix(webapp): groups highlighting
b2.7.0-516 		2023-07-20 09:19:54 +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
Hannes Heine
052d59b3b6
Merge pull request #6617 from Ocelot-Social-Community/6588-chat-link-to-chat-page 
feat(webapp): chat link to chat page
b2.7.0-515 		2023-07-20 06:39:28 +02:00
Markus
a8f32cad75 Merge branch 'master' into 6443-refactor-create-post-page 2023-07-19 22:01:47 +02:00
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
fae7bc614e Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-19 21:59:25 +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
Hannes Heine
d23eb77d3a
Merge pull request #6615 from Ocelot-Social-Community/fix-chat-last-message-check 
fix(webapp): fix lastMessage to contain proper values
b2.7.0-514 		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
b2.7.0-513 		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
b2.7.0-512 		2023-07-19 15:01:49 +02:00