[Pkg-owncloud-commits] [php-sabredav] 40/45: Merge branch '2.1'

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 44d8df4a64cba9da95484bfb2c7c79c8b2c1c49f
Merge: 9540fec 5bbba2c
Author: Evert Pot <me at evertpot.com>
Date:   Fri Jan 9 20:34:25 2015 -0500

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

 ChangeLog.md                                       |  7 +++
 lib/CalDAV/Backend/AbstractBackend.php             |  5 ++
 lib/CalDAV/Schedule/Plugin.php                     |  4 +-
 tests/Sabre/CalDAV/Backend/AbstractTest.php        | 54 ++++++++++++++++------
 .../Sabre/CalDAV/Schedule/DeliverNewEventTest.php  |  2 +-
 .../Sabre/CalDAV/Schedule/ScheduleDeliverTest.php  | 18 ++++----
 6 files changed, 65 insertions(+), 25 deletions(-)

diff --cc ChangeLog.md
index b053cfe,7e4845b..340df01
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,47 -1,13 +1,54 @@@
  ChangeLog
  =========
  
 +2.2.0-alpha2 (2015-??-??)
 +-------------------------
 +
 +* Renamed `Sabre\DAV\Auth\Backend\BackendInterface::requireAuth` to
 +  `challenge`, which is a more correct and better sounding name.
 +
 +
 +2.2.0-alpha1 (2014-12-10)
 +-------------------------
 +
 +* The browser plugin now has a new page with information about your sabredav
 +  server, and shows information about every plugin that's loaded in the
 +  system.
 +* #191: The Authentication system can now support multiple authentication
 +  backends.
 +* 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()`.
 +* #560: GuessContentType plugin will now set content-type to
 +  `application/octet-stream` if a better content-type could not be determined.
 +* #568: Added a `componentType` argument to `ICSExportPlugin`, allowing you to
 +  specifically fetch `VEVENT`, `VTODO` or `VJOURNAL`.
 +* #582: Authentication backend interface changed to be stateless. If you
 +  implemented your own authentication backend, make sure you upgrade your class
 +  to the latest API!
 +* #582: `Sabre\DAV\Auth\Plugin::getCurrentUser()` is now deprecated. Use
 +  `Sabre\DAV\Auth\Plugin::getCurrentPrincipal()` instead.
 +
 +
+ 2.1.3 (2015-??-??)
+ ------------------
+ 
+ * #586: SCHEDULE-STATUS should not contain a reason-phrase.
+ * #539: Fixed a bug related to scheduling in shared calendars.
+ 
+ 
  2.1.2 (2014-12-10)
  ------------------
  

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