Merge pull request #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop

* commit '403f8afa':
  ZP-823 Remove empty line.
  ZP-823 Do not sync suggested contacts folder.

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 #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop

* commit '673e1981':
  ZP-781 Use comma as decimal and dot as thousand separators, add 's' as unit for time usage.
  ZP-781 Nicer format for memory usage.

Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '66a7ae5d':
  ZP-817 Set task as private if sensitivity is private or greater.

Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop

* commit 'a973c6ff':
  ZP-808 Set appointment as private if sensitivity is private or greater.

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

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

unit for time usage. 

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 #131 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '1dd2d287':
  ZP-817 Unsetting private task in Outlook is not saved on the server.

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

Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop

* commit 'f8d7d6a3':
  ZP-793 Cache requested folderid so only the SyncCollections get changed that really had a change in flags.

that really had a change in flags.

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

Merge pull request #129 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit 'a333cd79':
  ZP-817 Sensitivity (private) of tasks is not saved on the server.

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

Merge pull request #128 in ZP/z-push from bugfix/ZP-766-outlook-sends-autodiscover-outlook to develop

* commit '289ed5cf':
  ZP-766 Accept outlook response schema on autodiscover, send XML response only for mobile response schema or empty otherwise.

only for mobile response schema or empty otherwise.

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

* commit '392bddc0':
  ZP-802 fix default Settings() responses.

Merge pull request #7 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop

* commit 'f087cedd':
  ZP-641 Make sure CleanStates does not touch permanent backend storage files, unless we really want to delete them.
  ZP-641 Revert "For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device."
  For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device.

backend storage files, unless we really want to delete them.

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

ZP-641 Revert "For Backend Storage type files, add a user element to the file name so that multiple accounts on the same device do not overwrite each others data in a single file named only for the device."

This reverts commit 38ce1ca0.

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

* commit 'daf481e5':
  ZP-682 Compare the configured LOGBACKEND lowercase.
  ZP-682 "filelog" and "syslog" classes can not be found by autoloader (because they are in camel case and not lowercase). Rewriting the backend loaded by ZLog to the class name, as this is more end-user friendly. Throwing a FatalNotImplementedException causes a recursion that eats up all available memory before it fails, as that exception tries to log which then throws the exception again.
  ZP-682 updated classmap for CalDav and CardDav backends. Removed includes from the backends.
  ZP-682 Never commit composer binary. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-682 Composer - AutoInclude. Released under the Affero GNU General Public License (AGPL) version 3.

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

(because they are in camel case and not lowercase). Rewriting the
backend loaded by ZLog to the class name, as this is more end-user
friendly.
Throwing a FatalNotImplementedException causes a recursion that eats up
all available memory before it fails, as that exception tries to log
which then throws the exception again.

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

includes from the backends.

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 feature/ZP-682-Composer-Auto-include

Conflicts:
	src/index.php
	src/z-push-admin.php
	src/z-push-top.php

* commit '85e27502':
  ZP-816 Add missing includes. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'aa801676':
  ZP-810 Missing configuration in BackendCombined for BackendLDAP. 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-810-Missing-config-BackendCombined

Conflicts:
	src/backend/combined/config.php

* commit '610cf709':
  ZP-684 New backend CardDAV. 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 feature/ZP-684-New-backend-CardDAV

Conflicts:
	src/backend/combined/config.php

* commit '4c9dd864':
  ZP-685 Move utils functions to TimezoneUtil. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-685 Fix misspelling. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-685 Date/Time function changes. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-685 New backend CalDAV. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-685 Move utils functions to TimezoneUtil. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #126 in ZP/z-push from bugfix/ZP-791-check-if-lastmodifieddate-is-processed to develop

* commit 'd1dbbb39':
  ZP-791 LastModifiedDate not set for notes when changed on the server.

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

Merge pull request #125 in ZP/z-push from bugfix/ZP-815-categories-on-emails-are-not-synchronized-updated to develop

* commit '12ea24fc':
  ZP-815 Remove categories if mobile does not submit them.
  ZP-815 Fixed StreamImporter to include categories when streaming an email update, added categories instance variable to SyncMail, added categories to MAPIProvider->GetEmailMapping(), implementing setting categories for emails.

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