[Pkg-owncloud-commits] [php-sabredav] 22/40: Merge branch '3.0'

[David Prévot]

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

taffit pushed a commit to tag 3.1.0-alpha2
in repository php-sabredav.

commit 1d62b5180c745b8c080858cbd2af1b2a45a746fd
Merge: 26c94eb ea84473
Author: Evert Pot <me at evertpot.com>
Date:   Tue Aug 11 14:25:23 2015 -0400

    Merge branch '3.0'
    
    Conflicts:
    	CHANGELOG.md
    	lib/DAV/Version.php
    	tests/Sabre/CalDAV/GetEventsByTimerangeTest.php

 CHANGELOG.md                                    | 14 ++++
 examples/addressbookserver.php                  |  2 +-
 examples/calendarserver.php                     |  2 +-
 examples/fileserver.php                         |  2 +-
 examples/groupwareserver.php                    |  2 +-
 lib/DAV/Auth/Plugin.php                         | 17 +++++
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php |  6 +-
 tests/Sabre/DAV/HttpGetTest.php                 | 43 +----------
 tests/Sabre/DAV/HttpHeadTest.php                | 97 +++++++++++++++++++++++++
 tests/Sabre/DAV/Xml/Request/PropPatchTest.php   | 16 ++--
 10 files changed, 147 insertions(+), 54 deletions(-)

diff --cc CHANGELOG.md
index c7a3013,06df25a..07b8069
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,26 -1,18 +1,40 @@@
  ChangeLog
  =========
  
 +3.1.0-alpha2 (????-??-??)
 +-------------------------
 +
 +* 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)
 +
 +
 +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],
++
++
+ 3.0.4 (2015-??-??)
+ ------------------
+ 
+ * #703: PropPatch in client is not correctly encoded.
+ 
+ 
+ 3.0.3 (2015-08-06)
+ ------------------
+ 
+ * #700: Digest Auth fails on `HEAD` requests.
+ * Fixed example files to no longer use now-deprecated realm argument.
+ * The zip release ships with [sabre/vobject 3.4.6][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].
  

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