[Pkg-owncloud-commits] [php-sabredav] 15/80: Merge branch '3.0'

[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 b7a702fc1cb6e8022e22b6d6d0dc4e054c53cf68
Merge: 782055b 69c1b5c
Author: Evert Pot <me at evertpot.com>
Date:   Tue Sep 15 23:47:01 2015 +0200

    Merge branch '3.0'
    
    Conflicts:
    	CHANGELOG.md
    	lib/DAV/Version.php

 CHANGELOG.md                                 | 11 ++++++++++
 lib/DAV/Server.php                           |  7 +++++-
 lib/DAV/Xml/Element/Response.php             |  2 +-
 lib/DAV/Xml/Property/Href.php                |  2 +-
 tests/Sabre/DAV/Xml/Element/ResponseTest.php | 32 ++++++++++++++++++++++++++++
 tests/Sabre/DAV/Xml/Property/HrefTest.php    | 15 +++++++++++++
 6 files changed, 66 insertions(+), 3 deletions(-)

diff --cc CHANGELOG.md
index b96be52,7b0211d..f2f989c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,39 -1,16 +1,50 @@@
  ChangeLog
  =========
  
 +3.1.0-alpha2 (2015-09-05)
 +-------------------------
 +
 +* Massive calendars and addressbooks should see a big drop in peak memory
 +  usage.
 +* Fixed a privilege bug in the availability system.
 +* #697: Added a "tableName" member to the PropertyStorage PDO backend. (@Frzk).
 +* #699: PostgreSQL fix for the Locks PDO backend. (@TCKnet)
 +* Removed the `simplefsserver.php` example file. It's not simple enough.
 +* #703: PropPatch in client is not correctly encoded.
 +* #709: Throw exception when running into empty
 +  `supported-calendar-component-set`.
 +* #711: Don't trigger deserializers for empty elements in `{DAV:}prop`. This
 +  fixes issues when using sabre/dav as a client.
 +* The zip release ships with [sabre/vobject 4.0.0-alpha2][vobj],
 +  [sabre/http 4.1.0][http], [sabre/event 2.0.2][evnt],
 +  [sabre/uri 1.0.1][uri] and [sabre/xml 1.2.0][xml].
 +
 +
 +3.1.0-alpha1 (2015-07-19)
 +-------------------------
 +
 +* Now requires PHP 5.5
 +* Upgraded to vobject 4, which is a lot faster.
 +* Support for PHP 7.
 +* #690: Support for `calendar-availability`, draft 05.
 +  [reference][calendar-availability].
 +* #691: Workaround for broken Windows Phone client.
 +* The zip release ships with [sabre/vobject 4.0.0-alpha1][vobj],
 +  [sabre/http 4.0.0][http], [sabre/event 2.0.2][evnt],
 +  [sabre/uri 1.0.1][uri] and [sabre/xml 1.1.0][xml].
 +
 +
+ 3.0.5 (2015-09-15)
+ ------------------
+ 
+ * #704: Fixed broken uri encoding in multistatus responses. This affected
+   at least CyberDuck, but probably also others.
+ * The zip release ships with [sabre/vobject 3.4.7][vobj],
++* The zip release ships with [sabre/vobject 3.4.7][vobj],
+   [sabre/http 4.1.0][http], [sabre/event 2.0.2][evnt],
+   [sabre/uri 1.0.1][uri] and [sabre/xml 1.2.0][xml].
+ 
+ 
  3.0.4 (2015-09-06)
  ------------------
  

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