disk.

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

Merge pull request #359 in ZP/z-push from feature/ZP-1037-modify-open-shared-folders-api-to to develop

* commit '46254ee5':
  ZP-1037 Fixed logging.
  ZP-1037 Execute FixStatesAdditionalFolderFlags() when calling z-push-admin fixstates.
  ZP-1037 Check for upgraded profiles that don't have flags. Implement flag fix in 'z-push-admin -a fixstates'.
  ZP-1037 Added flags to OpenSharedFolderAPI in ASDevice, DeviceManager, ZPushAdmin and WebserviceDevice. Added constant DeviceManager::FLD_FLAGS_REPLYASUSER. Renamed private method DeviceManager->getAdditionalSyncFolder() to getAdditionalSyncFolderObject() for better readability, modified checks on ASDevice->EditAdditionalFolder() to allow a flag modification (maintaining the same name), added SyncFolder->Flag as ignored parameter and populate it when calling DeviceManager->GetAdditionalUserSyncFolders().

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

z-push-admin fixstates.

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

flag fix in 'z-push-admin -a fixstates'.

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

ZPushAdmin and WebserviceDevice. Added constant
DeviceManager::FLD_FLAGS_REPLYASUSER. Renamed private method
DeviceManager->getAdditionalSyncFolder() to
getAdditionalSyncFolderObject() for better readability, modified checks
on ASDevice->EditAdditionalFolder() to allow a flag modification
(maintaining the same name), added SyncFolder->Flag as ignored parameter
and populate it when calling
DeviceManager->GetAdditionalUserSyncFolders().

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

Merge pull request #357 in ZP/z-push from bugfix/ZP-1039-z-push-admin-returns-exit-code-0 to develop

* commit '102507ff':
  ZP-1039 Don't use die() to terminate in error case for gab-sync.
  ZP-1039 Don't use die() to terminate in error case for z-push-admin.

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 #345 in ZP/z-push from feature/ZP-1025-email-text-preview-shows-links-on to develop

* commit '5b94272c':
  ZP-1025 Also filter https urls.
  ZP-1025 Remove all images and links from truncated plaintext emails.

Merge pull request #354 in ZP/z-push from bugfix/ZP-1028-postinst-fails-leaving-z-push-common to develop

* commit 'f771c572':
  ZP-1028 Postinst fails leaving z-push-common unconfigured. Released under the Affero GNU General Public License (AGPL) version 3. do not fail whole script, if z-push-admin fails

ZP-1028 Postinst fails leaving z-push-common unconfigured. Released under the Affero GNU General Public License (AGPL) version 3.
do not fail whole script, if z-push-admin fails

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

Merge pull request #349 in ZP/z-push from bugfix/ZP-1027-can-t-move-email-to-shared-public to develop

* commit 'f2e09d59':
  ZP-1027 entryid needs to be hexed.
  ZP-1027 Fixed wording.
  ZP-1027 Switch stores before checking permissions on move destination folder.
  ZP-1027 Add warn messages if a folder can not be resolved or opened on ACL check.

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

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

folder.

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

ACL check.

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

Merge pull request #347 in ZP/z-push from bugfix/ZP-1026-run-fixstates-on-each-package-installation to develop

* commit '46ae53ba':
  ZP-1025 run fixstates on each package installation. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1025 run fixstates on each package installation. 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 #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