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)

* commit '01358ff4':
  ZP-845 Improve Utils::FixFileOwner.

(cherry picked from commit fc5bc5d3)

Merge pull request #177 in ZP/z-push from bugfix/ZP-842-outlook-via-as-does-not-synchronize to develop

* commit '2b5c898e':
  ZP-842 Check if a folders parent ID is known on the mobile. If not, the folder is ignored and not synchronized to the device.

(cherry picked from commit ff984d6f)

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

* commit '400f2c12':
  ZP-844 Support Out-Of-Office start and end times.

(cherry picked from commit 42f70c87)

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 #154 in ZP/z-push from bugfix/ZP-840-ping-loop-if-exporter-state-is-not to develop

* commit 'a1541482':
  ZP-840 Rename exception variable.
  ZP-840 Renamed exception variable.
  ZP-840 Catch StateInvalidException when in partial mode.
  ZP-840 Do not throw StateNotFoundException as this messes up Ping. Just treat it as StateInvalid (which is true, FD indicates a state that is not available), do not catch both types in Ping as only StateInvalidException will be thrown.

(cherry picked from commit abf4c77c)

Conflicts:
	src/lib/core/synccollections.php
	src/lib/request/ping.php

Merge pull request #150 in ZP/z-push from bugfix/ZP-641-filestatemachine-backend-storage-file to develop

* commit '5c7a4b19':
  ZP-641 Delete file only if it exists.
  ZP-641 CleanStates() has to stop after deleting one BS file.
  ZP-641 call GetState() with the "do not clean" flag, changed CleanStates() to delete exact bs files when being calles without uuid for bs type (needs better fixing in ZP-835).

(cherry picked from commit 3f1f999e)

Merge pull request #157 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag-revert to develop

* commit '749e44a8':
  ZP-645 Revert "PHP 5.4+ ob_start() needs an extra flag to allow".

(cherry picked from commit 52e58756)

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

Merge pull request #147 in ZP/z-push from bugfix/ZP-833-change-zcp-default-server-location to develop

* commit '7d7ebda7':
  ZP-833 Use http socket as default MAPI_SERVER.

(cherry picked from commit 1bd7cd25)

Conflicts:
	src/backend/zarafa/config.php

* commit '5ee46844':
  ZP-830 Combined; minor formatting fixes. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 21fb7d6b)

* commit 'dd66bfdb':
  ZP-831 Combined - typo variable name. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 825880d1)

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

Merge pull request #140 in ZP/z-push from bugfix/ZP-826-ping-triggers-hierarchy-sync-when to develop

* commit '49773be6':
  ZP-826 Force synchronization of folder if there is an unknown error on exporter setup.

(cherry picked from commit f9e71d7f)

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

Merge pull request #133 in ZP/z-push from feature/ZP-781-nicer-format-for-memory-usage-and to develop

* commit '673e1981':
  ZP-781 Use comma as decimal and dot as thousand separators, add 's' as unit for time usage.
  ZP-781 Nicer format for memory usage.

(cherry picked from commit 109eb8f7)

Conflicts:
	src/lib/utils/utils.php

Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop

* commit 'd8718bdc':
  ZP-824 Remove local $sc as it is not needed.
  ZP-824 Invalidate all pingable flags on folders when doing a FolderSync (with changes) or FolderChange (Create, Update, Delete) operation.

(cherry picked from commit 6a7a9763)

Conflicts:
	src/lib/request/folderchange.php
	src/lib/request/foldersync.php

Merge pull request #136 in ZP/z-push from bugfix/ZP-823-do-not-sync-suggested-contacts-folder to develop

* commit '403f8afa':
  ZP-823 Remove empty line.
  ZP-823 Do not sync suggested contacts folder.

(cherry picked from commit 7845f6c9)

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.

(cherry picked from commit bca74a9c)

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

(cherry picked from commit 7d46686c)

Merge pull request #134 in ZP/z-push from bugfix/ZP-808-research-and-review-sensitivity-for to develop

* commit 'a973c6ff':
  ZP-808 Set appointment as private if sensitivity is private or greater.

(cherry picked from commit 752e61ab)

Merge pull request #130 in ZP/z-push from feature/ZP-793-ping-modifies-syncparameters-too-agressively to develop

* commit 'f8d7d6a3':
  ZP-793 Cache requested folderid so only the SyncCollections get changed that really had a change in flags.

(cherry picked from commit 200c9f74)

Merge pull request #135 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '66a7ae5d':
  ZP-817 Set task as private if sensitivity is private or greater.

(cherry picked from commit 289a1b62)

Merge pull request #131 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit '1dd2d287':
  ZP-817 Unsetting private task in Outlook is not saved on the server.

(cherry picked from commit 989e8537)

Merge pull request #129 in ZP/z-push from bugfix/ZP-817-pr_sensitivity-is-not-saved-for-tasks to develop

* commit 'a333cd79':
  ZP-817 Sensitivity (private) of tasks is not saved on the server.

(cherry picked from commit 1680807d)

Merge pull request #128 in ZP/z-push from bugfix/ZP-766-outlook-sends-autodiscover-outlook to develop

* commit '289ed5cf':
  ZP-766 Accept outlook response schema on autodiscover, send XML response only for mobile response schema or empty otherwise.

(cherry picked from commit 4dba2866)

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.

(cherry picked from commit 0cbe61f5)

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.

(cherry picked from commit bc1c1ace)

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.

(cherry picked from commit ec5b650b)

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().

(cherry picked from commit f9803a56)

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 '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)