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

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

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.

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.

Merge pull request #116 in ZP/z-push from bugfix/ZP-801-allow-all-day-recurring-event-without to develop

* commit 'feb9b279':
  ZP-801 allow all day reccuring events without timezone.

Merge pull request #104 in ZP/z-push from bugfix/ZP-787-typo-request-getdeviceid-request-getdeviceid to develop

* commit '00815c8d':
  ZP-787 fix typo Request::GetDeviceId() -> Request::GetDeviceID().

* commit '50dc9a5c':
  ZP-794 filestatemachine: use Utils::SafePutContents().
  ZP-794 add Utils::SafePutContents().

* commit 'a66f8222':
  ZP-765 Fixed missing spaces in log string. Fixed LOGLEVEL_DEVICEID so it works as expected. Fixed access of Log->unauthMessageCache - is now an instance variable. Fixed indentation. Throw a FatalNotImplementedException instead of a simple Exception.

* commit '2676adfb':
  ZP-795 hhvm fix: GetCutOffDate in utils.php.
  ZP-795 hhvm fix: use break instead of continue in switch.
  ZP-795 hhvm fix: {} -> [].
  ZP-795 hhvm fix: use bool instead of boolean.
  ZP-795 remove unused code.
  ZP-795 fix indentation.
  ZP-795 add parentheses to be sure of what we want.
  ZP-795 fix some bad sprintf.
  ZP-795 remove useless assignment.

works as expected. Fixed access of Log->unauthMessageCache - is now an
instance variable. Fixed indentation. Throw a
FatalNotImplementedException instead of a simple Exception.

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

* commit '701c5142':
  ZP-765 Some tweaks on the config file.
  ZP-765 Revert the delete of variable as they will used in a near future. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Add cache value for the check of the AuthUser in the SpecialLogUser array. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Add AfterInitialization function called in the ZLog static class. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Added a cache value for IsUserInSpecialLogUsers. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 AuthUser is now an instance class variable. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Remove unused parameters. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Moved the content of AuthenticationInfo into the initialize section of the Request static class. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 We should not use array deference because it might not be safe yet. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Removed unused variable. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Use PHP_EOL instead of \n. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Code formatting. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Adding the licence on top of the new files. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-765 Logging system now uses instance instead of static files. 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 #119 in ZP/z-push from bugfix/ZP-784-sync-with-remove-fails-if-source-message to develop

* commit 'eb7f48ba':
  ZP-784 Consider all StatusException with SYNC_MOVEITEMSTATUS_SUCCESS a SYNC_STATUS_SUCCESS and rewrite all other codes to SYNC_STATUS_OBJECTNOTFOUND.

ZP-810 Missing configuration in BackendCombined for BackendLDAP. 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-682 Never commit composer binary. Released under the Affero GNU General Public License (AGPL) version 3.