Merge branch 'master' into v7

NethServer · Jan 30, 2018 · b7d50aa · b7d50aa
2 parents 30a0f5f + ec7ea58
commit b7d50aa
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 9 deletions.
diff --git a/administrator-manual/en/nscom/_static/webtop-sub_imap_folder1.png b/administrator-manual/en/nscom/_static/webtop-sub_imap_folder1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-sub_imap_folder2.png b/administrator-manual/en/nscom/_static/webtop-sub_imap_folder2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-sub_imap_folder3.png b/administrator-manual/en/nscom/_static/webtop-sub_imap_folder3.png
diff --git a/administrator-manual/en/nscom/_static/webtop-sync_shared_eas.png b/administrator-manual/en/nscom/_static/webtop-sync_shared_eas.png
diff --git a/administrator-manual/en/webtop5.rst b/administrator-manual/en/webtop5.rst
@@ -171,11 +171,19 @@ where it is still possible to modify the individual elements, which will be save
 .. note::
 
   In order to receive data via EAS on mobile devices, it is necessary to verify 
-  that the shared resources (Calendars and Sections) have synchronization enabled (Complete or Read only):
+  that the shared resources (Calendars and Contacts) have synchronization enabled (Complete or Read only):
 
   .. image:: _static/webtop-multiple_sync.png
                :alt: Multiple synchronization
 
+It is possible to enable and disable the synchronization for each single shared resource (calendars and contacts).
+The user can customize every single resource received in sharing by deciding the type of synchronization.
+
+To do so, just right click on the shared resource → Customize → Sync. devices:
+
+  .. image:: _static/webtop-sync_shared_eas.png
+               :alt: Sync shared EAS
+
 Mail tags
 =========
 
@@ -196,6 +204,26 @@ the check box is named :guilabel:`Show quick preview on message row`.
 
 .. image:: _static/webtop-preview.png
 
+Subscription of IMAP folders
+============================
+
+On WebTop, by default, all IMAP folders on the server are all automatically subscribed and therefore all visible from the first login.
+
+If you want to hide from the view some folders, which is equivalent to removing the subscription,
+you can do so by simply clicking the right mouse button on the folder to hide and select from the interactive menu the item "Hide from the list".
+
+For example, if you want to hide the subfolder "folder1" from this list, just right-click on it and select "Hide from the list":
+
+.. image:: _statis/webtop-sub_imap_folder1.png
+
+It will then always be possible to manage the visibility of hidden folders by selecting the "Manage visibility" function:
+
+.. image:: _statis/webtop-sub_imap_folder2.png
+
+For example, if you want to restore the subscription of the "folder1" just hidden, just select it from the list of hidden folders
+and click on the icon on the left:  
+
+.. image:: _statis/webtop-sub_imap_folder3.png
 
 Export events (CSV)
 ===================

diff --git a/developer-manual/en/building_rpms.rst b/developer-manual/en/building_rpms.rst
@@ -85,6 +85,45 @@ After a successful build, the RPM is uploaded to ``packages.nethserver.org``,
 according to the ``DEST_ID`` variable value. Supported values are ``core`` for
 NethServer core packages, and ``forge`` for NethForge packages.
 
+Pull requests are commented automatically by ``nethbot``
+[#NethBot]_ with the links to available RPMs.
+
+Also issues are commented by ``nethbot`` if the following rules are respected in git commit messages:
+
+1. The issue reference (e.g. ``NethServer/dev#1234``) is present in the merge
+   commit of pull requests
+
+2. The issue reference is added to standalone commits (should be rarely used)
+
+
+Global variables
+^^^^^^^^^^^^^^^^
+
+The build environment supports the following variable:
+
+- ``NSVER``
+- ``DOCKER_IMAGE``
+- ``DEST_ID``
+
+NSVER
+~~~~~
+
+Select the target NethServer version for the build system.
+Currently the only supported value is ``7``.
+
+DOCKER_IMAGE
+~~~~~~~~~~~~
+
+The Docker build image can contain different RPMs depending on the tag:
+
+- ``latest`` or ``7``: contains only dependencies to build ``nethserver-*`` RPMS, like ``nethserver-base``.
+  It actually installs only nethserver-devtools and a basic RPM build environment without gcc compiler.
+- ``buildsys``: it s based on the previous environment. It also pulls in the dependencies for arch-dependant packages (like ``asterisk13`` or ``ns-samba``).
+  It actually installs the ``buildsys-build`` package group, which provides the ``gcc`` compiler among other packages.
+
+DEST_ID
+~~~~~~~
+
 If ``DEST_ID=core``:
 
 * Builds triggered by pull requests are uploaded to the ``autobuild`` [#Autobuild]_ repository
@@ -99,15 +138,7 @@ If ``DEST_ID=forge``:
 
 * Branch builds are uploaded to ``nethforge-testing``, whilst tagged builds are uploaded to ``nethforge``
 
-Pull requests are commented automatically by ``nethbot``
-[#NethBot]_ with the links to available RPMs.
-
-Also issues are commented by ``nethbot`` if the following rules are respected in git commit messages:
 
-1. The issue reference (e.g. ``NethServer/dev#1234``) is present in the merge
-   commit of pull requests
-
-2. The issue reference is added to standalone commits (should be rarely used)
 
 .. index::
    pair: Sign; RPM