[Pkg-owncloud-commits] [php-sabredav] 02/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 0bfaf17068f4bee57776be24c55a8a2d6b705b69
Merge: 31b68f2 33b602b
Author: Evert Pot <me at evertpot.com>
Date:   Wed Dec 10 16:59:12 2014 -0500

    Merge branch '2.1'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --cc ChangeLog.md
index 19d0be2,29c8f43..2731c16
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,41 -1,7 +1,41 @@@
  ChangeLog
  =========
  
 +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.2 (2014-??-??)
+ 2.1.2 (2014-12-10)
  ------------------
  
  * #566: Another issue related to the migration script, which would cause
@@@ -43,9 -9,10 +43,11 @@@
    migration.
  * #567: Doing freebusy requests on accounts that had 0 calendars would throw
    a `E_NOTICE`.
 +* #572: `HEAD` requests trigger a PHP warning.
  * #579: Browser plugin can throw exception for a few resourcetypes that didn't
    have an icon defined.
+ * The zip release ships with [sabre/vobject 3.3.4][vobj],
+   [sabre/http 3.0.4][http], and [sabre/event 2.0.1][evnt].
  
  
  2.1.1 (2014-11-22)

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