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 #374 in ZP/z-push from bugfix/ZP-1052-attached-eml-message-does-not-have to develop

* commit '27067630':
  ZP-1052 Attached eml message does not have size.
  ZP-1052 Attached eml message does not have size.

Merge pull request #345 in ZP/z-push from feature/ZP-1025-email-text-preview-shows-links-on to develop

* commit '5b94272c':
  ZP-1025 Also filter https urls.
  ZP-1025 Remove all images and links from truncated plaintext emails.

Conflicts:
	src/backend/zarafa/mapiprovider.php

Merge pull request #360 in ZP/z-push from bugfix/ZP-1040-if-devicedata-doesn-t-change-it-could to develop

* commit 'f57dd701':
  ZP-1040 Check if ASDevice->GetData returns any data before writing it to disk.

Conflicts:
	src/lib/utils/zpushadmin.php

Merge pull request #357 in ZP/z-push from bugfix/ZP-1039-z-push-admin-returns-exit-code-0 to develop

* commit '102507ff':
  ZP-1039 Don't use die() to terminate in error case for gab-sync.
  ZP-1039 Don't use die() to terminate in error case for z-push-admin.

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

Merge pull request #361 in ZP/z-push from bugfix/ZP-1013-ios-does-not-send-meeting-response to develop

* commit 'ca2145a5':
  ZP-1013 modified regexp for getting iOS user agent.
  ZP-1013 Uppercase hex globalobjid for iOS devices and Outlook.
  ZP-1013 iOS does not send meeting response.

Merge pull request #340 in ZP/z-push from bugfix/ZP-1020-appointments-as-meetings-on-android to develop

* commit '4d8e1e81':
  ZP-1020 Appointments as meetings on android devices.

Merge pull request #341 in ZP/z-push from bugfix/ZP-1021-return-sync_bodypreference_plain to develop

* commit 'a9373516':
  ZP-1021 Return SYNC_BODYPREFERENCE_PLAIN when $bpTypes is false in GetBodyPreferenceBestMatch.

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 #332 in ZP/z-push from bugfix/ZP-1007-wbxml-in-not-logged-if-requesthandler--handle to develop

* commit '58517e5b':
  ZP-1007 Changed wbxml debug output to FATAL loglevel.
  ZP-1007 Always log Wbxml debug data in case there is an error during RequestHandler->Handle().

Conflicts:
	src/lib/request/requestprocessor.php

Merge pull request #313 in ZP/z-push from bugfix/ZP-1000-not-possible-to-accept-meeting-request to develop

* commit '5093d44d':
  ZP-1000 Not possible to accept meeting request on iPhone.

Merge pull request #297 in ZP/z-push from bugfix/ZP-981-error-deleting-an-all-day-occurrence to develop

* commit 'e1c51ed4':
  ZP-981 Error deleting an all-day occurrence on a mobile device. Some code style fixes.

Conflicts:
	src/backend/zarafa/mapiprovider.php

Merge pull request #298 in ZP/z-push from bugfix/ZP-980-exception-of-an-all-day-recurrence to develop

* commit '86e2694f':
  ZP-980 Exception of an all day recurrence is not all day.

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

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

* commit '98d70540':
  ZP-884 Improve retrieval of hierarchy, also filter search folders.
  ZP-884 Fix GetHierarchy() to provide otherwise streamed properties to MAPIProvider->GetFolder().

Merge pull request #288 in ZP/z-push from bugfix/ZP-971-don-t-fail-when-source-message-id to develop

* commit 'ae2a761c':
  ZP-971 Don't fail when source message id is not found on move operations to the waste basket.

Conflicts:
	src/backend/zarafa/importer.php

Merge pull request #285 in ZP/z-push from feature/ZP-964-pass-z-push-version-in-an-additional to develop

* commit '15724c36':
  ZP-964 Expose Z-Push version via additional header to authenticated users.

* commit 'f0637512':
  ZP-970 Fixed the script to work with WBXML argument. Updated the copyright year.
  ZP-970 Allow call printwbxml from arbitrary directories and use externals files as in usage.

Merge pull request #273 in ZP/z-push from bugfix/ZP-957-timezone-dayofweek-occurrence-are to release/2.2

* commit 'acb959e3':
  ZP-957 Timezone DayOfWeek and week are switched when packing.

Merge pull request #276 in ZP/z-push from bugfix/ZP-959-decimals-in-memory-usage-and-time to release/2.2

* commit '38ce2a9b':
  ZP-959 Format time output at the end of the request to match memory usage format.

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

Merge pull request #205 in ZP/z-push from bugfix/ZP-881-change-zcp-server-location-for-listfolders to develop

* commit '3633fd8e':
  ZP-881 Updated copyright year.
  ZP-881 Define ZCP server location for listfolders depending on ZCP version.

Conflicts:
	src/backend/zarafa/listfolders.php

Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop

* commit '6c16c4a8':
  ZP-935 Check if ASDevice changed before saving it.

Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop

* commit 'aecb70f2':
  ZP-930 Define include path correctly.

Merge pull request #191 in ZP/z-push from bugfix/ZP-872-ping-doesn-t-catch-all-notifications to develop

* commit '94c04253':
  ZP-872 BackendZarafa->adviseStoreToSink() sometimes advised wrong store.

usage format.

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 #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.

(cherry picked from commit 9995418d)

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.

(cherry picked from commit 12d54f54)

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

* commit '02a91429':
  ZP-844 Delete from and until properties when out of office is not time based.

(cherry picked from commit 6c326890)

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

Merge pull request #156 in ZP/z-push from bugfix/ZP-794-use-safeputcontents-to-ensure-atomacy-2 to develop

* commit 'f34003c0':
  ZP-794 Remove now useless call to FixFileOwner.
  ZP-794 Call FixFileOwner in SafePutContents.

(cherry picked from commit f49acb93)

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

(cherry picked from commit 6ae18006)

Conflicts:
	src/lib/utils/utils.php

Merge pull request #178 in ZP/z-push from bugfix/ZP-860-show-z-push-version-in-autodiscover to develop

* commit 'ec8c8901':
  ZP-860 Show Z-Push version in autodiscover.

(cherry picked from commit 48b89e2b)