[Pkg-owncloud-commits] [php-sabredav] 35/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 5564dee80f1d383ca039b2ff135f470312b7ae75
Merge: 05f82a2 d514781
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Nov 24 00:27:26 2014 -0500

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

 ChangeLog.md                                       |  16 ++-
 bin/migrateto21.php                                |  23 ++--
 lib/CalDAV/ICSExportPlugin.php                     |   1 +
 lib/CalDAV/Schedule/Plugin.php                     |   4 +-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  | 152 ++++++++++++++-------
 5 files changed, 131 insertions(+), 65 deletions(-)

diff --cc ChangeLog.md
index 24fdc51,64b1739..a2d51ae
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,32 -1,16 +1,42 @@@
  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-??-??)
+ 2.1.2 (2014-??-??)
+ ------------------
+ 
+ * #566: Another issue related to the migration script, which would cause
+   scheduling to not work well for events that were already added before the
+   migration.
+ * #567: Doing freebusy requests on accounts that had 0 calendars would throw
+   a `E_NOTICE`.
+ 
++
+ 2.1.1 (2014-11-22)
  ------------------
  
  * #561: IMip Plugin didn't strip mailto: from email addresses.

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