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

5480 Commits

Author SHA1 Message Date
Ulf Gebhardt
2947ad635c
Merge branch 'master' into 6534-chat-room-usertag 2023-07-15 01:25:05 +02:00
Moriz Wahl
db594650f9 feat(webapp): mark messages as seen 2023-07-14 18:53:56 +02:00
Moriz Wahl
c46d0064fc unread rooms query in chat notification 2023-07-14 14:50:43 +02:00
entermex
138b851737 Change color red to green on cancel buttons of post and comments 2023-07-14 13:05:07 +02:00
Wolfgang Huß
40b40eb486 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page 2023-07-14 11:44:28 +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
Ulf Gebhardt
54cf5b37a5
order by indexId instead of createdAt 2023-07-14 11:09:04 +02:00
Ulf Gebhardt
faa474dcf6
fixed merge problem 2023-07-14 09:19:56 +02:00
Ulf Gebhardt
a9ad8c34c8
Merge branch 'master' into message-pagination 2023-07-14 09:13:40 +02:00
Markus
d496aef0a4 fixed linting 2023-07-13 22:56:38 +02:00
Markus
d73fd0cbb7 [bug] chat language is now reactive 2023-07-13 22:35:48 +02:00
mahula
db7c8d55e5
Merge branch 'master' into 6537-chat-remove-reply-smileys 2023-07-13 19:16:27 +02:00
Markus
9662e729aa Merge branch 'master' into 6443-refactor-create-post-page 2023-07-13 18:50:04 +02:00
Markus
caa7e8e1fb [refactor] updated ui of creat post page 2023-07-13 18:47:36 +02:00
Hannes Heine
4e6b927452
Merge branch 'master' into 6536-chat-remove-message-actions 2023-07-13 15:17:58 +02:00
Markus
08b78aad7c fixed linting 2023-07-13 14:45:44 +02:00
Markus
24c6884b9a [feature] changed usertag in chat messages to user-slug 2023-07-13 14:38:28 +02:00
Hannes Heine
dc83dd06d4
Merge branch 'master' into 6400-change-chat-style-and-lang 2023-07-13 12:19:10 +02:00
Wolfgang Huß
751c8b60a6 Add headline to chat page 2023-07-13 12:02:53 +02:00
Ulf Gebhardt
ac6bbf1840
remove setTimeout 2023-07-13 11:33:45 +02:00
Markus
cbf1bab2f2 [feature] remove reply emojis for chat component 2023-07-13 11:31:04 +02:00
Ulf Gebhardt
c21026e28a
fixed message loading state when writing and refetching 2023-07-13 11:23:06 +02:00
Markus
507be4eca2 [feature] removed message actions for chat 2023-07-13 11:15:46 +02:00
Ulf Gebhardt
1648b25516
lint fixes 2023-07-13 11:06:29 +02:00
Markus
fcfd58cedf merged master 2023-07-13 11:05:36 +02:00
Markus
9cca4c9e6f [feature] changed chat style export so rebranding is also working for chat 2023-07-13 11:00:44 +02:00
Ulf Gebhardt
d513a32ea8
Merge branch 'master' into message-pagination 2023-07-13 10:56:27 +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ß
f0826e6e44
Update webapp/locales/de.json 
Co-authored-by: Alexander Friedland <fridolin@tutanota.com>
 2023-07-13 08:49:34 +02:00
Wolfgang Huß
afcb2a1eed
Update webapp/locales/en.json 
Co-authored-by: Alexander Friedland <fridolin@tutanota.com>
 2023-07-13 08:49:19 +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ß
0eaa4059b3 Fix icon and dummy count for chat notification button in header menu 2023-07-12 16:07:33 +02:00
Wolfgang Huß
181207a90b Move chat notification button in header to position between language and system notification 
- Add this button to mobile as well.
 2023-07-12 14:28:04 +02:00
Ulf Gebhardt
730e15a9ea
working message pagination 2023-07-12 13:15:19 +02:00
Ulf Gebhardt
635d3a2232
new room query 2023-07-12 13:15:06 +02:00
Ulf Gebhardt
7e77bc82fb
new query including index & first, offset and orderBy 2023-07-12 13:14:43 +02:00
Markus
b2976f06eb updated style for chat component 2023-07-12 12:34:12 +02:00
Wolfgang Huß
a5cb81ceac Change group marker from blue to red on map 2023-07-12 11:24:12 +02:00
Wolfgang Huß
c51ded7b73 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map 2023-07-12 11:17:20 +02:00
Markus
c51f7afd9a fixed syntax error in default layout 2023-07-12 10:15:25 +02:00
Markus
64e732855b
Merge branch 'master' into 6400-change-chat-style-and-lang 2023-07-12 10:11:58 +02:00
Markus
44be837846 Merge branch '6400-change-chat-style-and-lang' of github.com:Ocelot-Social-Community/Ocelot-Social into 6400-change-chat-style-and-lang 2023-07-12 09:39:07 +02:00
Markus
86bd4bad5b fixed intends for token style file 2023-07-12 09:38:31 +02:00
mahula
e2da08c0ff
Merge branch 'master' into 6501-featurefrontend-event-creation-page 2023-07-11 15:59:33 +02:00
Markus
e33091b814 fix linting 2023-07-11 14:36:24 +02:00
Markus
a1b6576162 [refactor] adjusted label texts for filter menu 2023-07-11 14:26:45 +02:00
Markus
e81254e531 [refactor] changed button layout in filter menu 2023-07-11 14:26:19 +02:00