[Pkg-owncloud-commits] [php-sabredav] 15/64: Merge branch '2.1'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 2.2.0alpha1
in repository php-sabredav.

commit 171ff12292d918123ef127b8ef76d9a6be251ac8
Merge: b0ed65b e0290e7
Author: Evert Pot <me at evertpot.com>
Date:   Fri Nov 14 16:53:07 2014 -0500

    Merge branch '2.1'
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 ChangeLog.md                                       |  13 ++
 composer.json                                      |   2 +-
 lib/CalDAV/Plugin.php                              | 109 ++++++++++---
 lib/CalDAV/Schedule/ISchedulingObject.php          |   2 +-
 lib/CalDAV/Schedule/Plugin.php                     |  18 ++-
 lib/CalDAV/Schedule/SchedulingObject.php           | 116 +-------------
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 170 +++++++++++++++++++++
 tests/Sabre/CalDAV/FreeBusyReportTest.php          |  29 +++-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |   3 +-
 .../Sabre/CalDAV/Schedule/PluginPropertiesTest.php |  17 +++
 ... => PluginPropertiesWithSharedCalendarTest.php} |  29 +++-
 11 files changed, 361 insertions(+), 147 deletions(-)

diff --cc ChangeLog.md
index c6958f5,e00e320..f8ed8c9
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,26 -1,19 +1,39 @@@
  ChangeLog
  =========
  
 +2.2.0-alpha1 (????-??-??)
 +-------------------------
 +
 +* Removed: all `$tableName` arguments from every PDO backend. This was already
 +  deprecated, but has now been fully removed. All of these have been replaced
 +  with public properties.
 +* Deleted several classes that were already deprecated much earlier:
 +  * `Sabre\CalDAV\CalendarRootNode`
 +  * `Sabre\CalDAV\UserCalendars`
 +  * `Sabre\DAV\Exception\FileNotFound`
 +  * `Sabre\DAV\Locks\Backend\FS`
 +  * `Sabre\DAV\PartialUpdate\IFile`
 +  * `Sabre\DAV\URLUtil`
 +* Removed: `Sabre\DAV\Client::addTrustedCertificates` and
 +  `Sabre\DAV\Client::setVerifyPeer`.
 +* Removed: `Sabre\DAV\Plugin::getPlugin()` can now no longer return plugins
 +  based on its class name.
 +* Removed: `Sabre\DAVACL\Plugin::getPrincipalByEmail()`.
 +
 +
+ 2.1.0-beta1 (2014-??-??)
+ ------------------------
+ 
+ * #541: CalDAV PDO backend didn't respect overridden PDO table names.
+ * #550: Scheduling invites are no longer delivered into shared calendars.
+ * #554: `calendar-multiget` `REPORT` did not work on inbox items.
+ * #555: The `calendar-timezone` property is now respected for floating times
+   and all-day events in the `calendar-query`, `calendar-multiget` and
+   `free-busy-query` REPORTs.
+ * #555: The `calendar-timezone` property is also respected for scheduling
+   free-busy requests.
+ 
+ 
  2.1.0-alpha2 (2014-10-23)
  -------------------------
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git