* commit '3b7ea727':
  ZP-865 Update year.
  ZP-846 Update year.
  ZP-846 If folderdata is found also check if the synckey corresponds to the latest hierarchy synckey and update it if not.
  ZP-865 Abort conflict detection if there are more 100 changes to be exported.
  ZP-864 Do not convert UTF-8 only encoding. Updated copyright dates for changed files.
  ZP-864 Do not convert if charset encoding is already UTF-8.

Merge pull request #185 in ZP/z-push from bugfix/ZP-865-don-t-enter-conflict-detection-if to develop

* commit 'ec8a0989':
  ZP-865 Update year.
  ZP-865 Abort conflict detection if there are more 100 changes to be exported.

Merge pull request #186 in ZP/z-push from bugfix/ZP-846-z-push-admin-fix-states-need-to-fix to develop

* commit '578af98f':
  ZP-846 Update year.
  ZP-846 If folderdata is found also check if the synckey corresponds to the latest hierarchy synckey and update it if not.

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

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

the latest hierarchy synckey and update it if not.

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

Merge pull request #184 in ZP/z-push from bugfix/ZP-864-user-with-umlauts-in-user-name-is to develop

* commit '7a5e3723':
  ZP-864 Do not convert UTF-8 only encoding. Updated copyright dates for changed files.
  ZP-864 Do not convert if charset encoding is already UTF-8.

exported.

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

changed files.

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

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

* commit '30c07ae3':
  ZO-81 Fix color name in comment.
  ZO-81 Transport notes as appointments (for real!), set note lastmodified time from appointment's dtstamp on incoming, set body for notes only if the asbody element is incoming.
  ZO-81 Set PR_ICON_INDEX and PidLidNoteColor from categories sent from Outlook, translate note color to category when streaming to outlook, fallback to yellow if no category is sent, fixed typos
  ZO-81 Use Task as Note transport, set category from color when streaming to Outlook, set color from category when saving from Outlook.
  ZO-81 Transport note color in apppointment location, don't import/save message if no body is transmitted by OL, color has hidden instance SyncNote variable, set other appointment values: busystatus (free), sensitivity (dafault), alldayevent (false), reminder (no), mettingstatus (no meeting) and responserequested (no), send last modification timestamp in dtstamp.
  ZO-81 Transport Notes as Appointments.

* commit '179d735c':
  ZP-77 Add BASE_PATH to the policies file, fixed typo.
  ZP-864 Cleaning up code for Seb.
  ZP-864 User with umlauts in user name is not able to login in Outlook.
  ZP-77 use policies.ini from z-push directory.

* commit 'a647a1bc':
  ZP-77 Add BASE_PATH to the policies file, fixed typo.

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

Merge pull request #182 in ZP/z-push from bugfix/ZP-864-user-with-umlauts-in-user-name-is to develop

* commit '6811dae8':
  ZP-864 Cleaning up code for Seb.
  ZP-864 User with umlauts in user name is not able to login in Outlook.

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

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

time from appointment's dtstamp on incoming, set body for notes only if
the asbody element is incoming.

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

* commit '8a35ab80':
  ZP-77 Added link to Z-Push wiki page on policies to policies.ini. Use constant instead of hard-coded 'default' string in z-push-admin.php.
  ZP-77 Remove unnecessary brackets.
  ZP-77 Only save policyname and policyhash after provisioning has been successful. PolicyName is part of mapping of SyncProvisioning now. Get the policyname from the backend only to determine which policy is configured for the user.
  ZP-77 Save the policies from file in zpush.php and make them available via a getter.
  ZP-77 Update GetUserPolicyName() header in zarafa.php and backend.php to match the interface. Change log entry from multiple lines to single one.
  ZP-852 Show user's policy name in z-push-admin.
  ZP-77 Do not check for policy changes in Ping. Changed logging in DeviceManager for policy name. Disabled PasswordRecoveryEnabled policy in default section of policies.ini.
  ZP-77 Missing closing "}".
  ZP-77 Changed loading of SyncProvisioning object. Added function to Streamer to return variable names of mapping.
  ZP-77 Fixed typo in allowstoragecard policy name (was allostoragecard).
  ZP-77 Move default policies to utils. Join the default policies with the loaded policies and build hash on the joined policies. Comment the policies.
  ZP-77 Use magic setter method for saving policies' hash in device data. Change Exception message to notify that policies changed.
  ZP-77 Better param description in setPolicies of ASDevice. Added TODO to get the policy name in zarafa backend.
  ZP-77 Save policies' hash in devicedata. Compare saved policies from devicedate with the current policies in ProvisionRequired call.
  ZP-77 Added policies.ini containing the default policies. On the Provisioning load policies from the policies.ini. Added check if default policies exist. Extended backend to load custom policies.

* commit 'c127914e':
  ZP-77 Added link to Z-Push wiki page on policies to policies.ini. Use constant instead of hard-coded 'default' string in z-push-admin.php.
  ZP-77 Remove unnecessary brackets.
  ZP-77 Only save policyname and policyhash after provisioning has been successful. PolicyName is part of mapping of SyncProvisioning now. Get the policyname from the backend only to determine which policy is configured for the user.
  ZP-77 Save the policies from file in zpush.php and make them available via a getter.
  ZP-77 Update GetUserPolicyName() header in zarafa.php and backend.php to match the interface. Change log entry from multiple lines to single one.
  ZP-852 Show user's policy name in z-push-admin.
  ZP-77 Do not check for policy changes in Ping. Changed logging in DeviceManager for policy name. Disabled PasswordRecoveryEnabled policy in default section of policies.ini.
  ZP-77 Missing closing "}".
  ZP-77 Changed loading of SyncProvisioning object. Added function to Streamer to return variable names of mapping.
  ZP-77 Fixed typo in allowstoragecard policy name (was allostoragecard).
  ZP-77 Move default policies to utils. Join the default policies with the loaded policies and build hash on the joined policies. Comment the policies.
  ZP-77 Use magic setter method for saving policies' hash in device data. Change Exception message to notify that policies changed.
  ZP-77 Better param description in setPolicies of ASDevice. Added TODO to get the policy name in zarafa backend.
  ZP-77 Save policies' hash in devicedata. Compare saved policies from devicedate with the current policies in ProvisionRequired call.
  ZP-77 Added policies.ini containing the default policies. On the Provisioning load policies from the policies.ini. Added check if default policies exist. Extended backend to load custom policies.

constant instead of hard-coded 'default' string in z-push-admin.php.

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

Outlook, translate note color to category when streaming to outlook,
fallback to yellow if no category is sent, fixed typos

Merge branch 'feature/ZP-77-systemwide-policy-configuration' of https://manfred@stash.z-hub.io/scm/zp/z-push.git into feature/ZP-77-systemwide-policy-configuration

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

successful. PolicyName is part of mapping of SyncProvisioning now. Get
the policyname from the backend only to determine which policy is
configured for the user.

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

to Outlook, set color from category when saving from Outlook.

* commit '9995418d':
  ZP-861 Move comment.
  ZP-861 User with umlauts in user name is not able to login.
  ZP-844 Fix warnings when PR_EC_OUTOFOFFICE_FROM and PR_EC_OUTOFOFFICE_UNTIL are not set. Rename settingsOOFSEt to settingsOofSet and settingsOOFGEt to settingsOofGet.

Merge pull request #13 in ZO/z-push from feature/ZO-71-z-push-save-incoming-data-with-plugin to develop

* commit 'bc1f4cd4':
  ZO-71 Fixed space.
  ZO-71 Save data from the OL plugin and display it in every Outlook request and in z-push-admin.

request and in z-push-admin.

Merge pull request #180 in ZP/z-push from bugfix/ZP-861-user-with-umlauts-in-user-name-is to develop

* commit 'b29d19cf':
  ZP-861 Move comment.
  ZP-861 User with umlauts in user name is not able to login.

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

Merge pull request #181 in ZP/z-push from feature/ZP-844-support-out-of-office-start-and-end to develop

* commit '0738cae2':
  ZP-844 Fix warnings when PR_EC_OUTOFOFFICE_FROM and PR_EC_OUTOFOFFICE_UNTIL are not set. Rename settingsOOFSEt to settingsOofSet and settingsOOFGEt to settingsOofGet.

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

message if no body is transmitted by OL, color has hidden instance
SyncNote variable, set other appointment values: busystatus (free),
sensitivity (dafault), alldayevent (false), reminder (no), mettingstatus
(no meeting) and responserequested (no), send last modification
timestamp in dtstamp.

PR_EC_OUTOFOFFICE_UNTIL are not set. Rename settingsOOFSEt to
settingsOofSet and settingsOOFGEt to settingsOofGet.

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

* commit '6c326890':
  ZP-844 Delete from and until properties when out of office is not time based.
  ZP-860 Show Z-Push version in autodiscover.