Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop

* commit '4c91e8b0':
  ZP-720 Write memory information and END tag also to the user log file.

(cherry picked from commit d8979595)

* commit 'c782d49a':
  ZP-724 Add CalendarType also to SyncTaskRecurrence and SyncMeetingRequestRecurrence objects.
  ZP-724 Add instance variable for calendar type.
  ZP-724 ADD CalendarType to SyncRecurrence object.

(cherry picked from commit a8b25c37)

Merge pull request #65 in ZP/z-push from bugfix/ZP-723-windowsize-of-512-is-used-when-exporting to develop

* commit '407c07bc':
  ZP-723 Overwrite windowsSize only if it's bigger than the available global windowSize.

(cherry picked from commit 96b99c45)

Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop

* commit 'd72a5be9':
  ZP-677 Expose ResyncFolder to webservice. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 63f86fdc)

Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop

* commit '1bf55951':
  ZP-721 Added option to tail the error log file, "wide view" can now also be disabled.

(cherry picked from commit 9dced9e2)

Merge pull request #63 in ZP/z-push from bugfix/ZP-719-request-class-not-found-on-autodiscover to develop

* commit 'b6b9f0c0':
  ZP-719 Include Request class in AutoDiscover.

(cherry picked from commit 34279f42)

Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop

* commit '92031424':
  ZP-717 Don't use $props as it is used before.
  ZP-717 Set PR_LAST_VERB_EXECUTED and PR_LAST_VERB_EXECUTION_TIME correctly when replying/forwarding an email.

(cherry picked from commit 657e2548)

Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop

* commit '27454aad':
  ZP-704 Fixed white space.
  ZP-704 z-push-top screen-size calculation fails under OS X. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit ba460f57)

Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop

* commit 'e6b04fab':
  ZP-676 Removed trailing space. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-676 Fix to handle incoming STREAMER_TYPE_SEND_EMPTY property type. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 113e7645)

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

reverted.

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

Revert "Merge pull request #34 in ZP/z-push from bugfix/ZP-672-options-without-authentication-info to develop"

This reverts commit 1935c35b.

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 #56 in ZP/z-push from bugfix/ZP-703-z-push-top-and-admin-does-NOT-honor-new-ZPUSH_CONFIG-define to develop

* commit 'df0558e3':
  ZP-703 z-push-top and -admin does NOT honor new ZPUSH_CONFIG define. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 2949dd5d)

General Public License (AGPL) version 3.

Public License (AGPL) version 3.

Merge pull request #54 in ZP/z-push from bugfix/ZP-701-logging-binary-can-cause-out-of-memory to develop

* commit '9904f3bc':
  ZP-701 Truncate content on binary output log. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6cfaf59b)

* commit '20281136':
  ZP-651 Only contact DeviceManager if DeviceID is set. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 57437225)

* commit '967a0c36':
  ZP-697 Honour global window size. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 5716e806)

Merge pull request #43 in ZP/z-push from bugfix/ZP-692-diffstate.php-use-different-cutoff to develop

* commit '9106da1f':
  ZP-692 Add notes and set to false when we don't care about filtertime. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-692 Different cutoff dates. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 0dbd04af)

* commit '5c9b2683':
  ZP-680 Rename package to 'z-push-dev', remove version string so the version can be determined from git tags. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-680 Bump to version 2.3 to go into develop, fix z-push.org link. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-660 Composer package. Released under the Affero GNU General Public License (AGPL) version 3. Creating a z-push/z-push package on https://packegist.org/ to be able to install released versions of z-push via Composer. This requires a composer.json file in the root of the package.

(cherry picked from commit 57704dea)

Merge pull request #42 in ZP/z-push from feature/ZP-686-use-php_sapi_name-to-detect-console to develop

* commit 'e5f75f64':
  ZP-686 Do not expose information in state migrate script. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-686 Add check also to z-push-top. Don't expose additional information about the system configuration to a potential attacker. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-686 Replace $_SERVER["TERM"] with php_sapi_name(). Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 02ffccf1)

Merge pull request #47 in ZP/z-push from feature/ZP-687-extract-zarafa-mapiprovider-getsyncblobfromtz to develop

* commit 'd75e8b87':
  ZP-687 Extract function from Zarafa MAPI provider to TimeZoneUtils. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 0b5edfc3)

* commit '01d04d3d':
  ZP-690 Remove extra count. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit ab13d880)

Merge pull request #45 in ZP/z-push from bugfix/ZP-689-stateobject.php-use-args-in-sprintf to develop

* commit 'b27439fa':
  ZP-689 Use args in sprintf. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6e73f339)

Merge pull request #44 in ZP/z-push from bugfix/ZP-688-devicemanager.php-typo-in-log-line to develop

* commit '671c6f50':
  ZP-688 Typo in log message. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 42033e4f)

* commit 'b57de6be':
  ZP-683 Fix typo. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 3a663014)

Merge pull request #33 in ZP/z-push from feature/ZP-671-log-memory-and-time-details-on-end to develop

* commit 'aac92fc7':
  ZP-671 Changes recommended by Manfred. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-671 Log memory and time info. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 80c61fc1)

Merge pull request #34 in ZP/z-push from bugfix/ZP-672-options-without-authentication-info to develop

* commit '0db8a314':
  ZP-672 Always require Authentication header. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-672 Options without authentication info. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 22dd9503)

* commit '86eea041':
  ZP-678 Allow to autoload backends. Released under the Affero GNU General Public License (AGPL) version 3. Do not try to include backend, if it can be or is already autoloaded. Allows to place backends outside z-push package.

(cherry picked from commit cf3ad6fb)

Merge pull request #32 in ZP/z-push from bugfix/ZP-670-autodiscover-use-http_response_code to develop

* commit 'd4524802':
  ZP-670 Use http_response_code. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 35763ff2)

Merge pull request #31 in ZP/z-push from feature/ZP-669-compat-add-function-http_response_code to develop

* commit '4c356e5e':
  ZP-669 Add function http_response_code to compat. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 98f36d84)

Merge pull request #22 in ZP/z-push from feature/ZP-659-backendcombined-add-changessink-methods to develop

* commit '1af618fb':
  ZP-659 Remove else. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-659 - Add ChangesSink methods. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 5ef30764)

Merge pull request #17 in ZP/z-push from feature/ZP-565-add-folderid-to-the-exportchangesdiff--initializeexporter to develop

* commit '3d7b775b':
  ZP-565 Added folderid to the output of found changes. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 17f2507c)

* commit 'e070d653':
  First check if neither object has the array property set, and if that is the case log it at debug level and continue with the comparison of other properties.

(cherry picked from commit 08bf61c6)

Merge pull request #23 in ZP/z-push from feature/ZP-660-backendcombined-implement-searchprovider to develop

* commit '6a8f86d7':
  ZP-660 Implement SearchProvider. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit c550648b)

Merge pull request #24 in ZP/z-push from feature/ZP-661-backendcombined-return-min-as-version to develop

* commit '37b2caa8':
  ZP-661 Return AS supported version. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6abb6e5c)

* commit '5c41dc02':
  ZP-662 Simplify BackendCombined config. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 042bceb5)