diff --git a/user_manual/talk/advanced_features.rst b/user_manual/talk/advanced_features.rst index 061878789a4..cebd870ca06 100644 --- a/user_manual/talk/advanced_features.rst +++ b/user_manual/talk/advanced_features.rst @@ -159,3 +159,32 @@ This section informs participants that the call may be recorded. To give explici .. image:: images/give-recording-consent.png .. image:: images/give-recording-consent-checked.png +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 +^^^^^^^^^^^^^^^^^^^^^^^ + +The moderator of the conversation can send an invite to participant on a different server: + +.. image:: images/federation-invite-send.png + +When receiving a notification, user will see a counter of pending invites above the conversations list. + +.. image:: images/federation-invite-pending.png + :width: 450px + +Upon clicking it, more information will be provided about inviting party, and user can either accept or decline the invitation. + +.. image:: images/federation-invite-dialog.png + :width: 450px + +By accepting the invite, conversation will appear in the list as any other one. + +.. image:: images/federation-conversations-list.png + :width: 450px diff --git a/user_manual/talk/images/add-participants.png b/user_manual/talk/images/add-participants.png index 7dc42ad638a..1153c460d16 100644 Binary files a/user_manual/talk/images/add-participants.png and b/user_manual/talk/images/add-participants.png differ diff --git a/user_manual/talk/images/chat-with-one-user.png b/user_manual/talk/images/chat-with-one-user.png index d5199f0ac84..4b9d6f9c14a 100644 Binary files a/user_manual/talk/images/chat-with-one-user.png and b/user_manual/talk/images/chat-with-one-user.png differ diff --git a/user_manual/talk/images/drag-and-drop.png b/user_manual/talk/images/drag-and-drop.png index 325c40ce9b4..734f2cdce6c 100644 Binary files a/user_manual/talk/images/drag-and-drop.png and b/user_manual/talk/images/drag-and-drop.png differ diff --git a/user_manual/talk/images/editing-document-in-chat-room.png b/user_manual/talk/images/editing-document-in-chat-room.png index 1c424291d13..d509b2f1d77 100644 Binary files a/user_manual/talk/images/editing-document-in-chat-room.png and b/user_manual/talk/images/editing-document-in-chat-room.png differ diff --git a/user_manual/talk/images/federation-conversations-list.png b/user_manual/talk/images/federation-conversations-list.png new file mode 100644 index 00000000000..954afe2e306 Binary files /dev/null and b/user_manual/talk/images/federation-conversations-list.png differ diff --git a/user_manual/talk/images/federation-invite-dialog.png b/user_manual/talk/images/federation-invite-dialog.png new file mode 100644 index 00000000000..69cdc5565c6 Binary files /dev/null and b/user_manual/talk/images/federation-invite-dialog.png differ diff --git a/user_manual/talk/images/federation-invite-pending.png b/user_manual/talk/images/federation-invite-pending.png new file mode 100644 index 00000000000..13fdac3f994 Binary files /dev/null and b/user_manual/talk/images/federation-invite-pending.png differ diff --git a/user_manual/talk/images/federation-invite-send.png b/user_manual/talk/images/federation-invite-send.png new file mode 100644 index 00000000000..1aef3795f31 Binary files /dev/null and b/user_manual/talk/images/federation-invite-send.png differ diff --git a/user_manual/talk/images/message-editing.png b/user_manual/talk/images/message-editing.png new file mode 100644 index 00000000000..1c8b5197d14 Binary files /dev/null and b/user_manual/talk/images/message-editing.png differ diff --git a/user_manual/talk/images/message-silent.png b/user_manual/talk/images/message-silent.png new file mode 100644 index 00000000000..a0cbb5373d5 Binary files /dev/null and b/user_manual/talk/images/message-silent.png differ diff --git a/user_manual/talk/images/new-room.png b/user_manual/talk/images/new-room.png index da2af3acb6b..708fee85d95 100644 Binary files a/user_manual/talk/images/new-room.png and b/user_manual/talk/images/new-room.png differ diff --git a/user_manual/talk/images/share-screen-with-camera.png b/user_manual/talk/images/share-screen-with-camera.png index 53979e5d21f..549cda3b7d0 100644 Binary files a/user_manual/talk/images/share-screen-with-camera.png and b/user_manual/talk/images/share-screen-with-camera.png differ diff --git a/user_manual/talk/talk_basics.rst b/user_manual/talk/talk_basics.rst index 011753c4272..acbde304690 100644 --- a/user_manual/talk/talk_basics.rst +++ b/user_manual/talk/talk_basics.rst @@ -14,9 +14,10 @@ Chats and calls take place in conversations. You can create any number of conver Creating a chat --------------- -You can create a direct, one-on-one chat by searching for the name of a user, a group or a circle and clicking it. For a single user, a conversation is immediately created and you can start your chat. For a group or circle you get to pick a name and settings before you create the conversation and add the participants. +You can create a direct, one-on-one chat by searching for the name of a user, a group or a team and clicking it. For a single user, a conversation is immediately created and you can start your chat. For a group or circle you get to pick a name and settings before you create the conversation and add the participants. .. image:: images/chat-with-one-user.png + :width: 400px If you want to create a custom group conversation, click the button next to the search field and filters button and then on ``Create a new conversation``. @@ -33,7 +34,7 @@ In the second step, you get to add participants and finalize the creation of the .. image:: images/add-participants.png :width: 500px -You can cancel the creation of a conversation by clicking outside the white menu area at any time. +After confirmation you will be redirected to the new conversation and can start communicating right away. .. image:: images/new-room.png @@ -94,6 +95,14 @@ You can add emoji using the picker on the left of the text input field. .. image:: images/emoji-picker.png :width: 450px +Editing messages +---------------- + +You can edit messages and captions to file shares up to 6 hours after sending. + +.. image:: images/message-editing.png + :width: 450px + Using Markdown --------------- @@ -147,6 +156,21 @@ You can enhance your messages with a markdown syntax support. See list for usage > blockquote second line of blockquote +**Task lists** + +.. code-block:: none + + - [ ] task to be done + - [x] completed task + +**Tables** + +.. code-block:: none + + Column A | Column B + -- | -- + Data A | Data B + Setting reminder on messages ---------------------------- @@ -175,6 +199,15 @@ In the ``...`` menu you can also choose to reply privately. This will open a one Here you can also create a direct link to the message or mark it unread so you will scroll back there next time you enter the chat. When it is a file, you can view the file in Files. +Silent messages +--------------- + +If you don't want to disturb anyone in the middle of the night, there is a silent mode for chatting. +While it is enabled, other participants will not receive notifications from your messages. + +.. image:: images/message-silent.png + :width: 450px + Managing a conversation -----------------------