diff --git a/admin_manual/configuration_files/file_sharing_configuration.rst b/admin_manual/configuration_files/file_sharing_configuration.rst index 9e2c65892..3834f2a69 100644 --- a/admin_manual/configuration_files/file_sharing_configuration.rst +++ b/admin_manual/configuration_files/file_sharing_configuration.rst @@ -58,6 +58,9 @@ forcing them. `Wrong folder date when syncing `_ for discussion of this. +.. note:: There are more sharing options on config.php level available: + :ref:`Configuration Parameters` + .. _transfer_userfiles_label: Distinguish between max expiration date and default expiration date diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index f77ced725..35aecf0f3 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -1527,6 +1527,8 @@ One way to test is applying for a trystack account at http://trystack.org/ To use swift V3 +.. _configPHP_Sharing: + Sharing ------- diff --git a/user_manual/files/access_webgui.rst b/user_manual/files/access_webgui.rst index ac38b188b..31fb55f28 100644 --- a/user_manual/files/access_webgui.rst +++ b/user_manual/files/access_webgui.rst @@ -61,30 +61,6 @@ Favorites .. figure:: ../images/files_page-1.png :alt: Marking Favorite files. -Share - Share the file or folder with a group or other users, and create public - shares with hyperlinks. You can also see who you have shared with already, - and revoke shares by clicking the trash can icon. - -.. note:: You can also see all re-shares of your original file shares. - - If username auto-completion - is enabled, when you start typing the user or group name Nextcloud will - automatically complete it for you. If your administrator has enabled email - notifications, you can send an email notification of the new share from the - sharing screen. - -.. figure:: ../images/files_page-2.png - :alt: Sharing files. - -You have five share permissions: - -* Can share; allows the users you share with to re-share. -* Can edit; allows the users you share with to edit your shared files, and to collaborate using the Documents app. -* Create; allows the users you share with to create new files and add them to the share. -* Change; allows uploading a new version of a shared file and replacing it. -* Delete; allows the users you share with to delete shared files. - Overflow Menu The Overflow menu (three dots) displays file details, and allows you to rename, download, or delete files. @@ -198,15 +174,6 @@ Moving files You can move files and folders by dragging and dropping them into any directory. - -Change in share expiration date -------------------------------- - -In older versions of Nextcloud, you could set an expiration date on both local -and public shares. Now you can set an expiration date only on public shares, -and local shares do not expire when public shares expire. The only way to -"expire" a local share is to click the trash can icon to un-share your files. - Creating or connecting to a Federation Share link ------------------------------------------------- diff --git a/user_manual/files/index.rst b/user_manual/files/index.rst index 4da7a0b5d..c32c37614 100644 --- a/user_manual/files/index.rst +++ b/user_manual/files/index.rst @@ -11,7 +11,7 @@ Files & synchronization deleted_file_management desktop_mobile_sync encrypting_files - federated_cloud_sharing + sharing file_drop large_file_upload quota diff --git a/user_manual/files/sharing.rst b/user_manual/files/sharing.rst new file mode 100644 index 000000000..bf759eb36 --- /dev/null +++ b/user_manual/files/sharing.rst @@ -0,0 +1,115 @@ +============ +File Sharing +============ + +Nextcloud users can share files and folders. Possible targets are + +* public links +* users +* groups +* circles +* talk conversations +* users or groups on federated Nextcloud servers + +.. note:: Some options may note be available due to administrative configuration. + See :doc:`admin documentation ` for details. + + +Public link shares +------------------ + +You can share files and folders via public links. + +A random 15-digit token will be created. The link will look like ``https://cloud.example.com/s/yxcFKRWBJqYYzp4``. + +A number of options are available for public *folder* shares: + +.. figure:: ../images/sharing_public_folder.png + +* **Read only** to allow viewing and downloading +* ** Allow upload and editing** +* With ** File drop**, the sharee can only upload files to a folder without seeing the files that are already in that folder. +* **Hide download** prevents the sharee from downloading +* **Password protect** +* **Set expiration date** will automatically disable the share +* **Note to recipient** +* **Unshare** to revert the share +* **Add another link** to create multiple public links with different rights + +For public *file* shares, you may allow editing the file with one of Nextcloud's collaborative editing solutions. + +.. figure:: ../images/sharing_public_file.png + + +Internal shares with users and groups +------------------------------------- + +When sharing with users, groups, circles or members of a Talk conversation, rights for the files or folder contents are adjustable: + +.. figure:: ../images/sharing_internal.png + +As a sharee, you can configure if you automatically want to accept all incoming shares and have them added to your root folder, or if you +want to be asked each time if you want to accept or decline the share. + +.. figure:: ../images/sharing_internal_acceptNotification.png + +For adjusting the acceptance setting, go to **Settings** > **Personal** > **Sharing** + +.. figure:: ../images/sharing_autoAcceptSetting.png + + +Others with access +------------------ + +In order to find out if a file or folder is accessible to others through sharing of a superior folder +hierarchy level, click on **Others with access** in the sharing tab. + +.. figure:: ../images/sharing_others-with-access__collapsed.png + +The list shows all users, groups, chats etc. that the current object has been given access to through +sharing of a superior folder in the hierarchy. + +.. figure:: ../images/sharing_others-with-access__details.png + +Click on the three dots to + +* see who initiated the share +* see where the share was initiated (click to navigate to the folder, as far as you have access there) +* unshare the initial share (only accessible for the share owner) + + +.. note:: This information is only visible to the owner of a file/folder or sharees with resharing rights. + + +================ +Federated Shares +================ + +Federation Sharing allows you to mount file shares from remote Nextcloud servers, in effect +creating your own cloud of Nextclouds. You can create direct share links with +users on other Nextcloud servers. + +Creating a new Federation Share +------------------------------- + +Federation sharing is enabled by default. Follow these steps to create a new share with other Nextcloud or ownCloud servers: + +Go to your ``Files`` page and click the Share icon on the file or directory +you want to share. In the sidebar enter the username and URL of the remote user +in this form: ``@``. In this example, that is +``bob@cloud.example.com``. + +.. figure:: ../images/share-federation-1.png + +The sharee is receiving a notification in their Nextcloud, allowing them to either accept or decline the incoming share. + +.. figure:: ../images/share-federation-2-notification.png + + +Adding a public share to your Nextcloud +--------------------------------------- + +Nextcloud public link share pages offer an option to add that file or folder as a federated share into your own Nextcloud instance. +Just enter your ``@`` just like shown for outbound shares above: + +.. figure:: ../images/share-federation-3-public.png diff --git a/user_manual/images/direct-share-1.png b/user_manual/images/direct-share-1.png deleted file mode 100644 index 4575b3c6a..000000000 Binary files a/user_manual/images/direct-share-1.png and /dev/null differ diff --git a/user_manual/images/files_page-2.png b/user_manual/images/files_page-2.png deleted file mode 100644 index 1ae8cad68..000000000 Binary files a/user_manual/images/files_page-2.png and /dev/null differ diff --git a/user_manual/images/share-federation-1.png b/user_manual/images/share-federation-1.png new file mode 100644 index 000000000..ecca64302 Binary files /dev/null and b/user_manual/images/share-federation-1.png differ diff --git a/user_manual/images/share-federation-2-notification.png b/user_manual/images/share-federation-2-notification.png new file mode 100644 index 000000000..0f66d8309 Binary files /dev/null and b/user_manual/images/share-federation-2-notification.png differ diff --git a/user_manual/images/share-federation-3-public.png b/user_manual/images/share-federation-3-public.png new file mode 100644 index 000000000..d690cd8a0 Binary files /dev/null and b/user_manual/images/share-federation-3-public.png differ diff --git a/user_manual/images/sharing_autoAcceptSetting.png b/user_manual/images/sharing_autoAcceptSetting.png new file mode 100644 index 000000000..ec18ebc83 Binary files /dev/null and b/user_manual/images/sharing_autoAcceptSetting.png differ diff --git a/user_manual/images/sharing_internal.png b/user_manual/images/sharing_internal.png new file mode 100644 index 000000000..dac58234c Binary files /dev/null and b/user_manual/images/sharing_internal.png differ diff --git a/user_manual/images/sharing_internal_acceptNotification.png b/user_manual/images/sharing_internal_acceptNotification.png new file mode 100644 index 000000000..abfa132ca Binary files /dev/null and b/user_manual/images/sharing_internal_acceptNotification.png differ diff --git a/user_manual/images/sharing_others-with-access__collapsed.png b/user_manual/images/sharing_others-with-access__collapsed.png new file mode 100644 index 000000000..15e185bd7 Binary files /dev/null and b/user_manual/images/sharing_others-with-access__collapsed.png differ diff --git a/user_manual/images/sharing_others-with-access__details.png b/user_manual/images/sharing_others-with-access__details.png new file mode 100644 index 000000000..9d6a0762a Binary files /dev/null and b/user_manual/images/sharing_others-with-access__details.png differ diff --git a/user_manual/images/sharing_public_file.png b/user_manual/images/sharing_public_file.png new file mode 100644 index 000000000..de62796aa Binary files /dev/null and b/user_manual/images/sharing_public_file.png differ diff --git a/user_manual/images/sharing_public_folder.png b/user_manual/images/sharing_public_folder.png new file mode 100644 index 000000000..46e78e52b Binary files /dev/null and b/user_manual/images/sharing_public_folder.png differ