[Pkg-owncloud-commits] [php-sabredav] 32/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 93e61954fd82dfc397055cec5a10a636cf982a45
Merge: 828b3d8 60fcd59
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Nov 20 19:35:41 2014 -0500

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

 ChangeLog.md                                   |  6 ++++
 lib/CalDAV/Schedule/IMipPlugin.php             | 11 ++++--
 tests/Sabre/CalDAV/Schedule/IMipPluginTest.php | 46 +++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --cc ChangeLog.md
index 431de59,4e05576..24fdc51
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,31 -1,12 +1,37 @@@
  ChangeLog
  =========
  
 +2.2.0-alpha1 (????-??-??)
 +-------------------------
 +
 +* 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.
 +* 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.
 +
 +
+ 2.1.1 (2014-??-??)
+ ------------------
+ 
+ * #561: IMip Plugin didn't strip mailto: from email addresses.
+ 
+ 
  2.1.0 (2014-11-19)
  ------------------
  

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