Skip to content

Commit

Permalink
Merge branch 'master' into v7
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanchietti committed Feb 12, 2018
2 parents bccff84 + 89dc0ba commit 858d423
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 5 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 87 additions & 1 deletion administrator-manual/en/webtop5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,52 @@ To do so, just right click on the shared resource → Customize → Sync. device

.. image:: _static/webtop-sync_shared_eas.png
              :alt: Sync shared EAS


The default setting is “Not active”.

Sharing email folders or the entire account
===========================================

It is possible to share a single folder or the entire account with all the subfolders included.
Select the folder to share -> right click -> "Manage sharing":

.. image:: _static/webtop-sharing_mail_folder_1.png

- select the user to share the resource (1).
- select if you want to share your identity with the user and possibly even if you force your signature (2).
- choose the level of permissions associated with this share (3).
- if you need to change the permission levels more granularly, select "Advanced" (4).
- finally, choose whether to apply sharing only to the folder from which you started, or only to the branch of subfolders or to the entire account (5).

.. image:: _static/webtop-sharing_mail_folder_2.png

.. note::

If you also select "Force signature", when this identity is used, the user signature from which the shared mail was received will be automatically inserted.
In this case, however, it is necessary that the personalized signature of the User from which it originates has been associated to the Email address and not to the User.

Sharing calendars and contacts
==============================

Sharing Calendar
----------------

you can share each personal calendar individually.
Select the calendar to share -> right click -> "Sharing and permissions":

.. image:: _static/webtop-sharing_cal_1.png

Select the recipient user of the share (or Group) and enable permissions for both the folder and the individual items:

.. image:: _static/webtop-sharing_cal_2.png

Sharing Contacts
----------------

In the same way, you can always share your contacts by selecting the directory you want to share -> right click -> "Sharing and permissions".
Select the recipient user of the share (or Group), and enable permissions for both the folder and the individual items.


Mail tags
=========

Expand Down Expand Up @@ -466,6 +511,42 @@ Proceed as follows:

5. the next login will show the new logo on the login page

Change default limit "Maximum file size"
========================================

There are hard-coded configured limits related to the maximum file size:

- Maximum file size for chat uploads (internal default = 10 MB)
- Maximum file size single message attachment (internal default = 10 MB)
- Maximum file size for cloud internal uploads (internal default = 500 MB)
- Maximum file size for cloud public uploads (internal default = 100 MB)

To change these default values for all users, the following keys can be added via the admin interface: :guilabel:`Properties (system) -> Add`

**Maximum file size for chat uploads**

- Service: ``com.sonicle.webtop.core``
- Key: ``im.upload.maxfilesize``

**Maximum file size for single message attachment**

- Service: ``com.sonicle.webtop.mail``
- Key: ``attachment.maxfilesize``

**Maximum file size for cloud internal uploads**

- Service: ``com.sonicle.webtop.vfs``
- Key: ``upload.private.maxfilesize``

**Maximum file size for cloud public uploads**

- Service: ``com.sonicle.webtop.vfs``
- Key: ``upload.public.maxfilesize``

.. note::

The value must be expressed in Byte (Example 10MB = 10485760)

Importing contacts and calendars
================================

Expand Down Expand Up @@ -685,7 +766,12 @@ To apply the changes, execute: ::

List of PHP supported time zones: http://php.net/manual/it/timezones.php

Delete automatically suggested email addresses
----------------------------------------------

When compiling the recipient of a mail, some automatically saved email addresses are suggested.
If you need to delete someone because it is wrong, move with the arrow keys until you select the one you want to delete
(without clicking on it), then delete it with :guilabel:`Shift + Canc`

.. only:: nscom

Expand Down
18 changes: 16 additions & 2 deletions developer-manual/en/building_rpms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,26 @@ The :command:`release-tag` command, provided by the ``nethserver-mock`` RPM, exe
* commits changes to the :file:`spec` file.
* tags the commit (with optional GPG signature).

This is the help output::
To fetch issues from private GitHub repositories
`create a private GitHub access token <https://github.com/settings/tokens/new>`_.
Select the ``repo`` scope only.

Copy it to :file:`~/.release_tag_token` and keep its content secret: ::

chmod 600 ~/.release_tag_token

.. tip::

The private access token is useful also for public repositories
because authenticated requests have an higher API rate limit


The :command:`release-tag` command is now ready for use. This is the help output::

release-tag -h
Usage: release-tag [-h] [-k KEYID] [-T <x.y.z>] [<file>.spec]

For instance: ::
Sample invocation: ::

release-tag -k ABCDABCD -T 1.8.5 nethserver-mail-server.spec

Expand Down
4 changes: 4 additions & 0 deletions developer-manual/en/development_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ When submitting a PR, check that:

5. Multiple dependant PRs in multiple repositories must include the dependencies between them in the description

6. Select at least one PR reviewer (GitHub suggestions are a usually good)

7. Select yourself as the initial PR assignee

Managing an open pull request
-----------------------------

Expand Down
4 changes: 2 additions & 2 deletions developer-manual/en/license_headers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PHP, Javascript, CSS
::

/*
* Copyright (C) 2017 Nethesis S.r.l.
* Copyright (C) 2018 Nethesis S.r.l.
* http://www.nethesis.it - nethserver@nethesis.it
*
* This script is part of NethServer.
Expand All @@ -38,7 +38,7 @@ Perl, Python and BASH
::

#
# Copyright (C) 2017 Nethesis S.r.l.
# Copyright (C) 2018 Nethesis S.r.l.
# http://www.nethesis.it - nethserver@nethesis.it
#
# This script is part of NethServer.
Expand Down

0 comments on commit 858d423

Please sign in to comment.