diff --git a/user_manual/talk/advanced_features.rst b/user_manual/talk/advanced_features.rst index c6078101459..6b0afd779e4 100644 --- a/user_manual/talk/advanced_features.rst +++ b/user_manual/talk/advanced_features.rst @@ -87,6 +87,16 @@ From within Deck, you can share tasks into chat conversations. .. image:: images/deck-talk-share-card-to-chat-in-talk.png :width: 600px +Meetings and events +-------------------- + +If calendar events have a Talk conversation set as event location, you will see an information about upcoming events inside of this conversation. +That way you can stay informed about scheduled meetings or activities directly within your chat. +If Calendar app is enabled, you can click on an event to view details. + +.. image:: images/events-upcoming.png + :width: 400px + Breakout rooms -------------- Breakout rooms allow you to divide a Nextcloud Talk call into smaller groups for more focused discussions. The moderator @@ -204,8 +214,6 @@ Federated conversation ---------------------- With Federation feature, users can create conversations across different federated Talk instances and use Talk features as if they were on a same server. -**Important** Under current development. Basic chat features are available, more to come in the future! - Feature is required to be set up by the system administration. Send and accept invites @@ -230,3 +238,5 @@ By accepting the invite, conversation will appear in the list as any other one. .. image:: images/federation-conversations-list.png :width: 400px + +You can use it further to chat with participants from other federated servers, join calls and use other available Talk features. \ No newline at end of file diff --git a/user_manual/talk/images/ban-participant-dialog.png b/user_manual/talk/images/ban-participant-dialog.png new file mode 100644 index 00000000000..38a9f4874f9 Binary files /dev/null and b/user_manual/talk/images/ban-participant-dialog.png differ diff --git a/user_manual/talk/images/ban-participant-list.png b/user_manual/talk/images/ban-participant-list.png new file mode 100644 index 00000000000..1d9b698cd7d Binary files /dev/null and b/user_manual/talk/images/ban-participant-list.png differ diff --git a/user_manual/talk/images/ban-participant.png b/user_manual/talk/images/ban-participant.png new file mode 100644 index 00000000000..e35f11f4a75 Binary files /dev/null and b/user_manual/talk/images/ban-participant.png differ diff --git a/user_manual/talk/images/events-upcoming.png b/user_manual/talk/images/events-upcoming.png new file mode 100644 index 00000000000..540935832af Binary files /dev/null and b/user_manual/talk/images/events-upcoming.png differ diff --git a/user_manual/talk/images/smart-picker.png b/user_manual/talk/images/smart-picker.png new file mode 100644 index 00000000000..2417f0ab033 Binary files /dev/null and b/user_manual/talk/images/smart-picker.png differ diff --git a/user_manual/talk/talk_basics.rst b/user_manual/talk/talk_basics.rst index 4b56e58c624..eafe6733e95 100644 --- a/user_manual/talk/talk_basics.rst +++ b/user_manual/talk/talk_basics.rst @@ -4,13 +4,17 @@ Basics of Nextcloud Talk Nextcloud Talk lets you chat and have video calls on your own server. -Chats and calls take place in conversations. You can create any number of conversations. There are two kinds of conversations: +Chats and calls take place in conversations. You can create any number of conversations. There are several kinds of conversations: 1. **One-on-one conversations.** This is where you have a private chat or call with another Talk user. You can't add other people to this conversation or share it with a link. You start a direct one-on-one chat by looking for another user in the search bar and then clicking their name. +If a user becomes unavailable for long period and set an out-of-office status, you will find additional information in this conversation, such as provided description, absence date, or their replacement person. 2. **Group conversations.** Besides the person who created the conversation, a group conversation can have any number of people in it. A group conversation can be shared publicly with a link, so external guest users can join a call. It can also be listed, so other people on your Nextcloud server can join the conversation. + +3. **Note to self.** This is a special conversation with yourself. You can use it to write message notes, create to-do lists or forward content to save. + Creating a chat --------------- @@ -98,6 +102,16 @@ You can add emoji using the picker on the left of the text input field. .. image:: images/emoji-picker.png :width: 400px +Smart Picker +------------ + +Smart picker shortcut makes it easier to insert links, files, or other content into your conversations. +Just choose the type of content you want to insert (files, Talk conversations, Deck cards, GIFs, etc.) +You can also type `/` in the chat input to open the selector. + +.. image:: images/smart-picker.png + :width: 400px + Editing messages ---------------- @@ -231,6 +245,28 @@ Here you can configure the description, guest access, if the conversation is vis .. image:: images/conversation-settings-dialog.png :width: 600px +Ban participants +---------------- + +To help keep discussions safe and under control, moderators can ban participants from conversations. +It could be internal users or guests (in this case their IP-addresse will additionally be banned). + +In the participants list, select the user or guest you, and click ``Remove participant``. + +.. image:: images/ban-participant.png + :width: 300px + +There, toggle checkbox ``Also ban from this conversation`` and provide a reason for the ban. The banned user will be removed and prevented from rejoining. + +.. image:: images/ban-participant-dialog.png + :width: 400px + +You can later find the list of banned users in the ``Moderation`` section of conversation settings. +Here, you can see the reason for the ban and revert it if needed. + +.. image:: images/ban-participant-list.png + :width: 400px + Messages expiration -------------------