[Pkg-owncloud-commits] [php-sabredav] 04/220: Merge branch 'master' into sharing-take-2

[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 4280b0f3c302711858b0a572faf73413f358a5f4
Merge: 234a5a5 1d1c53d
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jul 20 19:22:01 2015 -0400

    Merge branch 'master' into sharing-take-2

 .travis.yml                                        |   3 +-
 CHANGELOG.md                                       |  37 +-
 README.md                                          |  18 +-
 bin/migrateto21.php                                |   8 +-
 composer.json                                      |   6 +-
 lib/CalDAV/Backend/PDO.php                         |   4 +-
 lib/CalDAV/Calendar.php                            |   1 +
 lib/CalDAV/CalendarQueryValidator.php              |  12 +-
 lib/CalDAV/Notifications/Plugin.php                |   2 +
 lib/CalDAV/Plugin.php                              |  14 +
 lib/CalDAV/Schedule/IMipPlugin.php                 |   2 +-
 lib/CalDAV/Schedule/Inbox.php                      |   1 +
 lib/CalDAV/Schedule/Plugin.php                     |  33 +-
 lib/CalDAV/Subscriptions/Plugin.php                |   2 +
 lib/CalDAV/Xml/Notification/InviteReply.php        |   2 +
 lib/CardDAV/AddressBook.php                        |   1 +
 lib/CardDAV/Plugin.php                             |   4 +
 lib/DAV/Auth/Backend/AbstractBasic.php             |   2 +-
 lib/DAV/Auth/Backend/AbstractDigest.php            |   2 +-
 lib/DAV/Auth/Backend/Apache.php                    |   2 +-
 lib/DAV/Auth/Backend/BackendInterface.php          |   2 +-
 lib/DAV/Browser/Plugin.php                         |  19 +-
 lib/DAV/Client.php                                 |   7 +
 lib/DAV/IMultiGet.php                              |   1 +
 lib/DAV/Locks/Plugin.php                           |   1 +
 lib/DAV/Mount/Plugin.php                           |   1 +
 lib/DAV/Server.php                                 |   5 +
 lib/DAV/Sync/Plugin.php                            |   3 +-
 lib/DAV/Version.php                                |   2 +-
 lib/DAV/Xml/Element/Prop.php                       |   1 +
 lib/DAV/Xml/Response/MultiStatus.php               |   1 +
 lib/DAVACL/AbstractPrincipalCollection.php         |   1 +
 lib/DAVACL/Xml/Property/Acl.php                    |   2 +-
 .../Xml/Property/CurrentUserPrivilegeSet.php       |   1 +
 tests/Sabre/CalDAV/CalendarQueryValidatorTest.php  |   3 +
 .../CalDAV/ExpandEventsDTSTARTandDTENDTest.php     |  45 ++-
 .../ExpandEventsDTSTARTandDTENDbyDayTest.php       |  47 ++-
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  |  51 ++-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php    |  54 +--
 tests/Sabre/CalDAV/Issue203Test.php                |  57 ++-
 tests/Sabre/CalDAV/PluginTest.php                  | 422 +++++++++++----------
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  | 248 ++++++++++--
 tests/Sabre/CalDAV/Schedule/PluginBasicTest.php    |   6 +-
 .../CalDAV/Xml/Request/CalendarQueryReportTest.php |  14 +-
 tests/Sabre/DAV/ClientTest.php                     |   8 +
 45 files changed, 744 insertions(+), 414 deletions(-)

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