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

* commit '598c1e3a':
  ZP-785 Fix mixed EOL.

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.

(cherry picked from commit f0543584)

Merge pull request #114 in ZP/z-push from bugfix/ZP-799-disallow-new-new-time-proposal-is to develop

* commit '63c9431e':
  ZP-799 Fix bug DisallowNewTimeProposal is AS14 and later feature. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6a1891a9)

* commit 'c18dab8b':
  ZP-798 Fixed even more whitespace wishes.
  ZP-798 Fixed whitespace.
  ZP-798 Set maxCount to the current counter + the requested window size, to prevent maxCount being too high and LoopDetection to get stuck.

(cherry picked from commit ddfc97ff)

* commit '9fc6294c':
  ZP-786 instanceof is lower case.

(cherry picked from commit d8e7289b)

Merge pull request #100 in ZP/z-push from feature/ZP-782-log-file-and-line-in-zpushexception to develop

* commit 'c1699802':
  ZP-782 log file and line in ZPushException.

(cherry picked from commit 35af4403)

Merge pull request #101 in ZP/z-push from bugfix/ZP-783-statusexception-from-phpwrapper-not to develop

* commit '25a8119b':
  ZP-783 Fixed typo and year.
  ZP-783 Catch StatusException when loading conflicts.

(cherry picked from commit 3e85ce06)

Merge pull request #99 in ZP/z-push from bugfix/ZP-780-incompatible-zcp-7.0.x-ics-importfolderchange to develop

* commit '7870e78a':
  ZP-780 Fix year.
  ZP-780 Fetch missing properties to be backwards compatible.

(cherry picked from commit 16ad9d52)

Merge pull request #94 in ZP/z-push from bugfix/ZP-773-autodiscover-needs-timezone-set-for to develop

* commit '19b811fa':
  ZP-773 Removed Berlios reference from contribution, and removed check for function date_default_timezone_set(). Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-773 Autodiscover needs timezone set. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 29f793ef)

* commit '6e2677b0':
  ZP-776 Remove obsolete link and function check.

(cherry picked from commit abf9cd3a)

Merge pull request #97 in ZP/z-push from bugfix/ZP-775-z-push-admin-a-resync-t-does-not-work to develop

* commit 'dea2b672':
  ZP-775 Allow 48 byte long folderIds.

(cherry picked from commit 5480afc4)

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

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

find -name '*.php' -print0 | xargs -0 -n1 dos2unix

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 #91 in ZP/z-push from feature/ZP-736-listfolders.php-should-also-list-sent to develop

* commit 'da987d93':
  ZP-736 listfolders.php should also list "Sent items" and "Inbox".
  ZP-736 listfolders.php should also list "Sent items" and "Inbox".
  ZP-736 listfolders.php should also list "Sent items" and "Inbox".

(cherry picked from commit e62f4478)

Merge pull request #89 in ZP/z-push from feature/ZP-735-add-option-to-delete-hierarchy-cache to develop

* commit 'e12c6cc5':
  ZP-735 Clearify the device switch and that this is the folder hierarchy.
  ZP-735 Add option to resync only the hierarchy of a specific user, device or all. When forcing resync, delete first all states of synchronized folders and afterwards the hierarchy, so the necessary information is still available. Reset contentData & ignoredMessages of the device ONLY when removing the hierarchy synckey, not when setting a new one.

(cherry picked from commit d1dfee9c)

Merge pull request #90 in ZP/z-push from bugfix/ZP-762-new-synckey-request-with-partial-causes to develop

* commit 'e56fec1e':
  ZP-762 Check if collection is synchronized before exporting changes in Partial mode.

(cherry picked from commit e80f4b93)

Merge pull request #87 in ZP/z-push from bugfix/ZP-584-downloading-email-attachments-within to develop

* commit '558d4f26':
  ZP-584 downloading email attachments within public folders fails on some android devices.
  ZP-584 downloading email attachments within public folders fails on some android devices.

(cherry picked from commit a97725a4)

Merge pull request #83 in ZP/z-push from bugfix/ZP-394-delayed-terminating-of-searches-throws to develop

* commit '10d06e4c':
  ZP-394 Delayed terminating of searches throws warning.

(cherry picked from commit 5998b9dc)

Merge pull request #84 in ZP/z-push from bugfix/ZP-755-update-bugtracker-url-in-legal-information to develop

* commit 'f355fe0c':
  ZP-755 Update year.
  ZP-755 Update year.
  ZP-755 Updated URLs.

(cherry picked from commit 6387b356)

Merge pull request #82 in ZP/z-push from bugfix/ZP-738-verify-previous-fixes-to-display-signed to develop

* commit 'b856384a':
  ZP-738 Remove uneccessary previous fixes to display signed messages correctly.

(cherry picked from commit 766866f1)

* commit '342e43cf':
  ZP-629 Removed tabs/whitespace, removed info log level message.
  ZP-629 Replace while with WBXMLDecoder::InWhile, and remove closing tag. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 0c1c79c0)

Merge pull request #80 in ZP/z-push from bugfix/ZP-729-attachments-of-signed-emails-are-not to develop

* commit '892fd2e6':
  ZP-729 Signed emails in outlook with ActiveSync aren't displayed as signed.

(cherry picked from commit 940716a0)

Merge pull request #75 in ZP/z-push from bugfix/ZP-729-attachments-of-signed-emails-are-not to develop

* commit '438d30f8':
  ZP-729 Attachments of signed emails are not available on Android 6.
  ZP-729 Renamed parseSmime to ParseSmime to match the code style.
  ZP-729 Attachments of signed emails are not available on Android 6.

(cherry picked from commit 6331dd1a)

* commit '9026b279':
  ZP-734 WBXML error on Settings:Password.

(cherry picked from commit 8b94e82a)

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

Merge pull request #86 in ZP/z-push from feature/ZP-757-add-getmapping-function-to-streamer to develop

* commit '49536031':
  ZP-757 Add GetMapping function to Streamer. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit e3ac9b1d)

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

Merge pull request #85 in ZP/z-push from bugfix/ZP-756-memory_get_peak_usage-is-not-available to develop

* commit '99ddef76':
  ZP-756 add compat function for memory_get_peak_usage.
  ZP-756 add compat function for memory_get_peak_usage.

(cherry picked from commit 7b3448b1)

Conflicts:
	src/lib/utils/compat.php

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

* commit '01f2c4a9':
  ZP-740 Set UUID, count & queued when loop data is created by SetSyncStateUsage(), log if IsSyncStateObsolete() does not find any data, log Loopdetection->Detect(), reset loopcount in case of 1.2.1, set type in Detect() if data is created by SetSyncStateUsage().

(cherry picked from commit d5d96750)

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

Merge pull request #74 in ZP/z-push from bugfix/ZP-732-nexus-5-android-6-sends-empty-data to develop

* commit '55a359c1':
  ZP-732 Accept empty <Data/> Tag.

(cherry picked from commit 87e0633d)

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

Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop

* commit 'bb60677f':
  ZP-702 Implement seeking capability to MAPIStreamWrapper. Add stream size to log output.
  ZP-702 Attachments are 1 or 2 bytes short. Released under the Affero GNU General Public License (AGPL) version 3. Fixed empty attachment data written, because stream was not at the beginning eg. by a previous call to fstat. Also logging now number of bytes written and not length of stream, to be able to detect similar problems.
  ZP-702 Implement plain and base64 encoded stream support into the wbxml encoder and streamer. Removed padding filter and added a null-char-replace filter used when streaming plain streams (tested but not part of this ticket).
  ZP-702 Attachments are 1 or 2 bytes short if size is not 3 byte aligned. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 64f7bbb2)

Conflicts:
	src/lib/wbxml/replacenullcharfilter.php

Merge pull request #72 in ZP/z-push from bugfix/ZP-730-check-internal-notifications-if-states to develop

* commit '0d4b2873':
  ZP-730 Undo change of ZP-631 (enabling notification check again). Check the states integrity before validating the notification. If state has been use, force a sync of the folder.

(cherry picked from commit aeab7567)