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

* commit '976c97f9':
  ZP-250 Develop logs on LOGLEVEL_WBXML by default.

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

* commit '28f39cda':
  ZP-250 Removed echo line, clearified TODO, removed other TODO.
  ZP-890 Undone previous version update, rechanged log level to LOGLEVEL_INFO and emptied IPC_PROVIDER.
  ZP-890 Go back to 2.3.0alpha2.
  ZP-890 Bump version to 2.3.0-alpha2.
  ZP-890 Bump version to 2.3.0alpha2.
  ZP-917 Set IPC_PROVIDER to empty value, change default log level to info, update version to 2.3.0alpha1.

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

Merge pull request #436 in ZP/z-push from feature/ZP-907-koe-secondary-contact-folder-support to develop

* commit '4c8fbb8d':
  ZP-907 Added config variable (not yet in config!) which disables the secondary contacts folder by default.
  ZP-907 Fixed typos from comments.
  ZP-907 Fix comment in ASDevice.
  ZP-907 Fixed typo.
  ZP-907 Added TypeReal (ignored) value to SyncFolder, assign SYNC_FOLDER_TYPE_UNKNOWN to the list of contact types, added Utils::ChangeFolderToTypeUnknownForKoe() and Utils::IsFolderToBeProcessedByKoe(), exporting SYNC_FOLDER_TYPE_USER_CONTACT as SYNC_FOLDER_TYPE_UNKNOWN when synchronizing to OL+KOE, accepting folder update when KOE is done patching the folder, patch additional folders when type is still SYNC_FOLDER_TYPE_UNKNOWN, prevent Sync & Ping for not yet patched folders.

secondary contacts folder by default.

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.

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

SYNC_FOLDER_TYPE_UNKNOWN to the list of contact types, added
Utils::ChangeFolderToTypeUnknownForKoe() and
Utils::IsFolderToBeProcessedByKoe(), exporting
SYNC_FOLDER_TYPE_USER_CONTACT as SYNC_FOLDER_TYPE_UNKNOWN when
synchronizing to OL+KOE, accepting folder update when KOE is done
patching the folder, patch additional folders when type is still
SYNC_FOLDER_TYPE_UNKNOWN, prevent Sync & Ping for not yet patched
folders.

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

* commit '917d7a35':
  ZP-1120 Put z-push-top, z-push-admin and z-push-gabsync into /usr/sbin.
  ZP-1111 Fixed (C) copyright symbol.
  ZP-1111 Updated debian.copyright file.
  ZP-1111 Updated headers of 'tools' files.
  ZP-1111 Update headers and LICENSE, added TRADEMARKS.
  ZP-1111 Update header in packaged version file.
  ZP-1115 Added logging.
  ZP-1115 Return the Z-Push version for WebserviceInfo->About().

Merge pull request #434 in ZP/z-push from bugfix/ZP-1120-move-z-push-admin-and-z-push-top to develop

* commit '992f3a42':
  ZP-1120 Put z-push-top, z-push-admin and z-push-gabsync into /usr/sbin.

* commit '17a47df9':
  ZP-1111 Fixed (C) copyright symbol.
  ZP-1111 Updated debian.copyright file.
  ZP-1111 Updated headers of 'tools' files.
  ZP-1111 Update headers and LICENSE, added TRADEMARKS.
  ZP-1111 Update header in packaged version file.

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.

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.

Merge pull request #432 in ZP/z-push from feature/ZP-1115-implement-webserviceinfo--about to develop

* commit 'c0d1478d':
  ZP-1115 Added logging.
  ZP-1115 Return the Z-Push version for WebserviceInfo->About().

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

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

* commit '04a25dda':
  ZP-1103 redirect error output of 'hash git' to /dev/null.
  ZP-916 Undo removal of SYSTEM check.
  ZP-916 Only define constants if they are not defined yet.
  ZP-916 Log message when account is hidden.
  ZP-1098 Use native body type algorithm to set native body type if it is undefined for appointments.
  ZP-972 Fixed @access.
  ZP-1102 Add folder origin constants to the allowed characters in the incoming data filter.
  ZP-916 Remove space in PR_EC_AB_HIDDEN constant name, check if value isset().
  ZP-1101 Log query string.
  ZP-972 Implement ZLog::SpecialLogUser() to be called before authentication is completed to force the generation of a user log, fixed method descriptions, use Log::unauthMessageCache for all unauthenticated users, fixed ZLog dependency in PrintWBXML, removed ZLog::RequestHeaders(), removed ZLog::SetSpecialLogUsers(), removed ZLog::EnableDeviceLog().
  ZP-1098 Set native body type to plain if it is undefined for appointments.
  replace deprecated mapi_openpropertytostream
  ZP-1094 Remove the use of spl_autoload for backend inclusion. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-916 Query and check for PR_EC_AB_HIDDEN.
  ZP-972 Add request header also to device specific log, by moving it from index.php to protected method ZLog::RequestHeader and calling it from ZLog::Initialise and ZLog::EnableDeviceLog.
  ZP-972 Use deviceid and authuser from Logger in zlog instead of getting them from Request. Renamed setLogToUserFile to SetLogToUserFile and added it as public to the abstract Log class. Renamed WbxmlDebug to IsWbxmlDebugEnabled. Fixed typos in function descriptions. Replaced tabs with spaces.
  ZP-972 fix WBXML is not logged for LOGUSERLEVEL >= LOGLEVEL_WBXML, if LOGLEVEL < LOGLEVEL_WBXML and $specialLogUsers is not already defined in config.php, because enabled on runtime via ZLog::EnableDeviceLog() or ZLog::setSpecialLogUsers().
  ZP-972 allow backends to enable device or user specific logging.

* commit '487f3f36':
  ZP-1103 redirect error output of 'hash git' to /dev/null.

* commit '06b09cbc':
  ZP-1094 Remove the use of spl_autoload for backend inclusion. 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 #424 in ZP/z-push from feature/ZP-1101-log-query-string-if-client-sends to develop

* commit '1b7f29c6':
  ZP-1101 Log query string.

Merge pull request #426 in ZP/z-push from bugfix/ZP-916-koe-even-after-setting-zarafahidden to develop

* commit 'ef361bd8':
  ZP-916 Undo removal of SYSTEM check.
  ZP-916 Only define constants if they are not defined yet.
  ZP-916 Log message when account is hidden.
  ZP-916 Remove space in PR_EC_AB_HIDDEN constant name, check if value isset().
  ZP-916 Query and check for PR_EC_AB_HIDDEN.

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

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

Conflicts:
	tools/gab-sync/lib/kopano.php

Merge pull request #423 in ZP/z-push from bugfix/ZP-1098-outlook-over-as-sync-doesn-t-work to develop

* commit '6b6c8a5d':
  ZP-1098 Use native body type algorithm to set native body type if it is undefined for appointments.
  ZP-1098 Set native body type to plain if it is undefined for appointments.

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

Merge pull request #425 in ZP/z-push from bugfix/ZP-1102-touchdown-is-not-able-to-reply-forward to develop

* commit '7a888d38':
  ZP-1102 Add folder origin constants to the allowed characters in the incoming data filter.

undefined for appointments.

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

Merge pull request #289 in ZP/z-push from feature/ZP-972-allow-backends-enable-device-or-user-logs to develop

* commit '74efedde':
  ZP-972 Fixed @access.
  ZP-972 Implement ZLog::SpecialLogUser() to be called before authentication is completed to force the generation of a user log, fixed method descriptions, use Log::unauthMessageCache for all unauthenticated users, fixed ZLog dependency in PrintWBXML, removed ZLog::RequestHeaders(), removed ZLog::SetSpecialLogUsers(), removed ZLog::EnableDeviceLog().
  ZP-972 Add request header also to device specific log, by moving it from index.php to protected method ZLog::RequestHeader and calling it from ZLog::Initialise and ZLog::EnableDeviceLog.
  ZP-972 Use deviceid and authuser from Logger in zlog instead of getting them from Request. Renamed setLogToUserFile to SetLogToUserFile and added it as public to the abstract Log class. Renamed WbxmlDebug to IsWbxmlDebugEnabled. Fixed typos in function descriptions. Replaced tabs with spaces.
  ZP-972 fix WBXML is not logged for LOGUSERLEVEL >= LOGLEVEL_WBXML, if LOGLEVEL < LOGLEVEL_WBXML and $specialLogUsers is not already defined in config.php, because enabled on runtime via ZLog::EnableDeviceLog() or ZLog::setSpecialLogUsers().
  ZP-972 allow backends to enable device or user specific logging.

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

incoming data filter.

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

isset().

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