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,358 Commits 117 Branches 1,511 Tags
Commit Graph

1462 Commits

Author SHA1 Message Date
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
Wolfgang Huß
858e3fdee8 Rename 'addRoom' to 'toggleUserSearch' in chat component 2023-07-20 10:40:04 +02:00
Hannes Heine
b881daef91
Merge branch 'master' into 6592-chat-component-+-button-open-search 2023-07-20 10:11:41 +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
Wolfgang Huß
26282c67b7 Make user search in chats function – second step 2023-07-19 16:41:23 +02:00
Wolfgang Huß
ffe51a0743 Separate 'ds-select' of 'AddGroupMember' into separate component 'SelectUserSearch' 2023-07-19 15:48:05 +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
Markus
85e68795a3 [fix] all group related pages are now under one route, so link highlighting works 2023-07-19 10:09:04 +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ß
c7deefa563 Close small chat if one changes to the chat room page 2023-07-18 17:33:45 +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ß
53a320fb9d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2023-07-14 11:40:24 +02:00
Wolfgang Huß
751c8b60a6 Add headline to chat page 2023-07-13 12:02:53 +02:00
Wolfgang Huß
20d7e0690e
Merge branch 'master' into 6436-show-the-event-on-the-map 2023-07-13 10:49:30 +02:00
Wolfgang Huß
34bb207e8e Change store commits into 'mapMutations' on user profile 2023-07-13 09:30:19 +02:00
Wolfgang Huß
40774b0498 Put user name in the tooltip of the chat button on the user profile 2023-07-13 08:59:51 +02:00
Wolfgang Huß
a07a8b35e0
Update webapp/pages/profile/_id/_slug.vue 
Co-authored-by: Alexander Friedland <fridolin@tutanota.com>
 2023-07-13 08:49:08 +02:00
Wolfgang Huß
2a44b18aa6 Fix icon and set texts on chat button on user profile 2023-07-12 16:11:58 +02:00
Wolfgang Huß
a5cb81ceac Change group marker from blue to red on map 2023-07-12 11:24:12 +02:00
Wolfgang Huß
f217c1d63c Replace properties.about by properties.description on map 2023-07-11 12:22:07 +02:00
Wolfgang Huß
11afa1f6d5 Simplify the map legend 2023-07-11 12:14:21 +02:00
Wolfgang Huß
6c32eb918d Add markers for events to map 2023-07-11 11:33:24 +02:00
Wolfgang Huß
7fa970ad1a Add event to map legend 2023-07-11 09:43:11 +02:00
Wolfgang Huß
f89f821dc4 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map 2023-07-10 11:20:25 +02:00
Ulf Gebhardt
610d279465
fixable lints 2023-07-06 13:08:41 +02:00
Ulf Gebhardt
2630862f3f
clean chat page 2023-07-06 12:32:27 +02:00
Ulf Gebhardt
38d555bdf8
rename chat-modul to chat 2023-07-06 12:30:50 +02:00
ogerly
572e175879 step 2 2023-07-06 12:26:28 +02:00
ogerly
1cb486cc8c chat-modul structur, add store state roomID 2023-07-06 11:30:55 +02:00
ogerly
9b4a71bd96 add store chat-modul, showChatModul 2023-07-06 07:17:38 +02:00
ogerly
9a690d6051 single chat modul in default template 2023-07-05 17:17:54 +02:00
ogerly
c8af90f0a6 add chat base-button in header menu 2023-07-05 15:51:55 +02:00
ogerly
34d38b117e remove client chat page, make chat components 2023-07-05 13:48:30 +02:00
Markus
708c769a3b added chat code as plugin for client rendering 2023-07-04 21:42:14 +02:00
Wolfgang Huß
f06369ad7c Setup displaying events on map – first step 2023-06-27 12:52:18 +02:00
ogerly
932ad7037f add apollo messages query 2023-06-20 13:09:12 +02:00
ogerly
a28be72e84 Chat rooms query 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-06-20 12:31:50 +02:00
ogerly
0330cbe900 import chat prework 2023-06-20 11:04:44 +02:00
ogerly
0f7312d21b vue-advanced-chat implemented and game page set up 2023-06-15 15:54:34 +02:00
Wolfgang Huß
c4a12a3a4a Merge branch 'merge-6336-into-6339-optimize-event-create-and-update' of github.com:Ocelot-Social-Community/Ocelot-Social into 6379-fix-event-teaser-date-from-start-to-end 2023-06-08 16:10:19 +02:00
elweyn
866079d307 Fix linting. 2023-06-08 09:49:42 +02:00
elweyn
5b40122b0e Remove async of cypress command and add contribution default value to post edit _id. 2023-06-08 09:44:11 +02:00
Wolfgang Huß
65b8780786
Merge branch 'master' into merge-6336-into-6339-optimize-event-create-and-update 2023-06-07 21:34:47 +02:00
Wolfgang Huß
04290921fc Move event location name to an own component 2023-06-07 16:40:51 +02:00
Wolfgang Huß
52cf19d5fc Rename component 'DateRange' to 'DateTimeRange' 2023-06-07 15:46:18 +02:00
Wolfgang Huß
7ad74b1398 Move date time range to an own component 2023-06-07 14:07:22 +02:00