Merge pull request #344 in ZP/z-push from bugfix/ZP-1024-accepting-mr-on-mobile-shows-meeting to develop

* commit '4a10fca5':
  ZP-1024 Prepend the short folderid to the MR ID of the calendar when on accepting the MR.

accepting the MR.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #342 in ZP/z-push from bugfix/ZP-1022-wrong-configuration-examples-in-gab-sync to develop

* commit '4ef35e4b':
  ZP-1022 Fixed example configurations.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #341 in ZP/z-push from bugfix/ZP-1021-return-sync_bodypreference_plain to develop

* commit 'a9373516':
  ZP-1021 Return SYNC_BODYPREFERENCE_PLAIN when $bpTypes is false in GetBodyPreferenceBestMatch.

GetBodyPreferenceBestMatch.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #340 in ZP/z-push from bugfix/ZP-1020-appointments-as-meetings-on-android to develop

* commit '4d8e1e81':
  ZP-1020 Appointments as meetings on android devices.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #337 in ZP/z-push from bugfix/ZP-1018-delete-folder-broken-in-diffbackend to develop

* commit '77c74dc9':
  ZP-1018 delete folder broken in diffbackend.

Merge pull request #338 in ZP/z-push from bugfix/ZP-1019-move-splitmessageid-function-to-utils to develop

* commit 'bb28568f':
  ZP-1019 Move SplitMessageId function to Utils class.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #335 in ZP/z-push from bugfix/ZP-1016-further-improve-rhel-scl-packaging to develop

* commit '92f6052d':
  ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.

I tried to make it more readable, but the compiler does not like it

ZP-1016 Further improve RHEL*SCL packaging. Released under the Affero GNU General Public License (AGPL) version 3.

minimum required packages to use z-push and kopano with scl

Merge pull request #334 in ZP/z-push from bugfix/ZP-1015-depend-on-php7.0-for-ubuntu-16.04 to develop

* commit '5b3fcbbe':
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.

add dependency on php7-mapi (currently available in core:master)

ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.

apache config packages also should depend on apache2

ZP-1015 Depend on php7.0 for Ubuntu 16.04. Released under the Affero GNU General Public License (AGPL) version 3.

add some "or"s into debian.control to catch the right php version on ubuntu 16.04

Merge pull request #332 in ZP/z-push from bugfix/ZP-1007-wbxml-in-not-logged-if-requesthandler--handle to develop

* commit '58517e5b':
  ZP-1007 Changed wbxml debug output to FATAL loglevel.
  ZP-1007 Always log Wbxml debug data in case there is an error during RequestHandler->Handle().

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #331 in ZP/z-push from bugfix/ZP-985-packages-for-red-hat-software-collections to develop

* commit '25585453':
  ZP-985 Packages for Red Hat Software collections make actually no use of them. Released under the Affero GNU General Public License (AGPL) version 3.

RequestHandler->Handle().

Released under the Affero GNU General Public License (AGPL) version 3.

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into bugfix/ZP-985-packages-for-red-hat-software-collections

Merge pull request #330 in ZP/z-push from bugfix/ZP-1005-sqlstatemachine.php-runs-in-a-constant to develop

* commit 'ca77ba8b':
  ZP-1005 Check if database name is confirm the SQL naming standards.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #315 in ZP/z-push from bugfix/ZP-1002-sql-state-backend-fails-with-postgresql to develop

* commit '542c801e':
  ZP-1002 is_null doesn't check for isset generating an undefined key warning.
  ZP-1002 replace tabs with spaces.
  ZP-1002 SQL state backend fails with PostgreSQL.

Merge pull request #323 in ZP/z-push from bugfix/ZP-997-cli-change-php-location-to-env-path to develop

* commit '0d6b3f01':
  ZP-997 Revert the ZPUSH_BASE_PATH to default value.
  ZP-997 CLI: change php and python location to env path.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #322 in ZP/z-push from bugfix/ZP-996-webserviceinfo--listuserfolders-does to develop

* commit 'e97d2f0c':
  ZP-996 WebserviceInfo->ListUserFolders() does not work correctly for the public folder. Made GetStoreProps() in mapiprovider public.

Merge pull request #321 in ZP/z-push from bugfix/ZP-1004-remove-dependency-on-apache2-from to develop

* commit '86e7bc36':
  ZP-1004 Remove dependency on "apache2" from z-push-autodiscover. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #326 in ZP/z-push from hotfix/ZP-1008-missing-syncronize-output-end-tag to develop

* commit '2339098b':
  ZP-1008 Missing Syncronize output end tag on sync when folder hierarchy changed.

changed.

Released under the Affero GNU General Public License (AGPL) version 3.

This reverts commit a43dd3b2.

Released under the Affero GNU General Public License (AGPL) version 3.

changed.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

warning.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

public folder. Made GetStoreProps() in mapiprovider public.

Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1004 Remove dependency on "apache2" from z-push-autodiscover. Released under the Affero GNU General Public License (AGPL) version 3.

remove leftover dependency