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

Merge pull request #573 in ZP/z-push from bugfix/ZP-1251-z-push-top-too-much-output-from-ping to develop

* commit 'a053308b':
  ZP-1251 Aggregate Ping announcements about changes.

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

Merge pull request #572 in ZP/z-push from bugfix/ZP-1257-removing-a-folder-added-in-additionalfolders to develop

* commit '8a72d5f7':
  ZP-1257 Remove statically configured shared folders from the list sent to ASDevice->SetAdditionalFolderList().

to ASDevice->SetAdditionalFolderList().

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

Merge pull request #570 in ZP/z-push from bugfix/ZP-1268-undefined-variable-name-in-z-push-admin to develop

* commit 'f6cc9d92':
  ZP-1268 Undefined variable: name in z-push-admin.

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

Merge pull request #566 in ZP/z-push from bugfix/ZP-1259-check-if-sm-data-is-empty-for-sendmail to develop

* commit '2072ec51':
  ZP-1259 Fixed typo in a variable.
  ZP-1259 Check if sm->data is empty for SendMail.

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 #563 in ZP/z-push from bugfix/ZP-1254-wastebasket-not-available-when-removing to develop

* commit 'fc9d98ee':

Merge pull request #562 in ZP/z-push from bugfix/ZP-1240-html-bodies-should-not-be-truncated to develop

* commit '4b293f5e':
  ZP-1240 Also HTML-trucate bodies from IMAP.
  ZP-1240 HTML safe truncate streams containing HTML data.
  ZP-1240 Add HTML safe truncation options to stream wrappers.
  ZP-1240 Add parameter $htmlsafe (default false) to Utils::Utf8_truncate().

Merge pull request #561 in ZP/z-push from bugfix/ZP-1255-send-as-not-working-for-other-companies to develop

* commit '3bd67f6d':
  ZP-1255 Directly use sharedUser if it's an email address. Enables sending in multi-company environments.

folder.

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

folder.

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

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

sending in multi-company environments.

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

Merge pull request #560 in ZP/z-push from bugfix/ZP-1256-z-push-admin-a-resync-t-folderid to develop

* commit 'd9b63fdd':
  ZP-1256 Set backend2folderidCache of ASDevice to false, so it can be rebuilt.
  ZP-1256 Rebuild backend2folderidCache of ASDevice if it's not available.
  ZP-1256 Rebuild backend2folderidCache of ASDevice if it's not available.

rebuilt.

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

* commit 'e03948fc':
  ZP-1250 Search for X-Push-Sender only in the headers.

This reverts commit 37251f16.

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 #556 in ZP/z-push from bugfix/ZP-1238-resources-in-outlook-are-registered to develop

* commit '5b2ad7da':
  ZP-1238 Save Atendee->type in MAPI.

Merge pull request #557 in ZP/z-push from bugfix/ZP-1249-wp-8.1-empty-sync-empty-response to develop

* commit 'ed53a7d5':
  ZP-1249 Answer with SYNC_STATUS_SYNCREQUESTINCOMPLETE if an empty sync request results in an empty response.

request results in an empty response.

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.

Utils::Utf8_truncate().

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

Merge pull request #554 in ZP/z-push from bugfix/ZP-1247-unexpected-synckey-stateinvalidexception to develop

* commit '1d374d62':
  ZP-ZP-1247 Check for if a synckey was confirmed in the request.

Merge pull request #555 in ZP/z-push from feature/ZP-1248-include-windowsmail-in-the-list-of to develop

* commit '430648aa':
  ZP-1248 Added WindowsMail to SYNC_TIMEOUT_LONG_DEVICETYPES.

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

If the synckey was confirmed the folderdata needs to be updated so the
data is consistent when an old state is deleted.

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

Merge pull request #551 in ZP/z-push from bugfix/ZP-1244-caldav-matching-default-calendars-fails-uppercase to develop

* commit '826d6c47':
  ZP-1244 use strcasecmp to compare CALDAV_PERSONAL and calendar id

Merge pull request #537 in ZP/z-push from bugfix/ZP-1224-caldav-pass-php-supported-timezone to develop

* commit '010e6e22':
  ZP-1224 Use TimezoneUtil functions to generate timezone string.
  ZP-1224 Pass PHP supported timezone to DateTimeZone.

If CALDAV_PERSONAL is defined with upper-case characters, a match would be impossible
Now, it will match by comparing case-insensitively.

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

Merge pull request #543 in ZP/z-push from bugfix/ZP-1230-windows-phone-8.1-unable-to-sync to develop

* commit '1691dff0':
  ZP-1230 Reverted change: Regexp faulty. Details in ticket comment.
  ZP-1230 Reverting change: newlines shouldn't matter in HTML.
  ZP-1230 Reverting change: ob_start() is not required at this point.
  ZP-1230 Reverting change: WBXMLEncoder->getBodypartsCount() is correct.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1230 windows-phone-8.1-unable-to-sync. Released under the Affero GNU General Public License (AGPL) version 3. Fixed as described in Jira.

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

Merge pull request #548 in ZP/z-push from bugfix/ZP-1241-don-t-perform-heartbeat-in-empty to develop

* commit '6f660c13':
  ZP-1241 Don't perform heartbeat for empty sync requests.