[Pkg-owncloud-commits] [php-sabredav] 82/275: Merge branch 'master' into calendar-auto-schedule

[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 08de7a0485e1f4442639840db5312f95b7e8a029
Merge: f9bdcdb 3e5492f
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 2 20:53:43 2014 -0400

    Merge branch 'master' into calendar-auto-schedule

 .gitignore                                         |   1 +
 .travis.yml                                        |   1 +
 ChangeLog.md                                       |  21 ++-
 composer.json                                      |   3 +-
 examples/basicauth.php                             |  26 ---
 examples/digestauth.php                            |  25 ---
 lib/CalDAV/ICSExportPlugin.php                     |   7 +-
 lib/CalDAV/Property/AllowedSharingModes.php        |  10 +-
 lib/CalDAV/Property/Invite.php                     | 176 ++++++++++-----------
 .../Property/SupportedCalendarComponentSet.php     |   8 +-
 lib/CardDAV/Plugin.php                             |   2 +-
 lib/CardDAV/Property/SupportedAddressData.php      |   2 +-
 lib/DAV/Browser/Plugin.php                         |  18 +--
 lib/DAV/Browser/PropFindAll.php                    |   2 +-
 lib/DAV/Browser/assets/openiconic/open-iconic.css  |   1 -
 .../{TooMuchMatches.php => TooManyMatches.php}     |   4 +-
 lib/DAV/IFile.php                                  |   2 +-
 lib/DAV/Locks/Plugin.php                           |   2 +-
 lib/DAV/PropFind.php                               |   2 +-
 lib/DAV/Property/LockDiscovery.php                 |  18 +--
 lib/DAV/PropertyStorage/Plugin.php                 |  14 +-
 lib/DAV/Server.php                                 |   2 +-
 lib/DAV/TemporaryFileFilterPlugin.php              |   4 +-
 lib/DAV/Tree/Filesystem.php                        |   2 +-
 lib/DAV/XMLUtil.php                                |   5 +-
 tests/Sabre/DAV/Browser/PluginTest.php             |   4 +-
 tests/Sabre/DAV/Exception/TooManyMatchesTest.php   |  36 +++++
 tests/Sabre/DAV/PropertyStorage/PluginTest.php     |  38 ++++-
 tests/phpcs/ruleset.xml                            |  57 +++++++
 29 files changed, 293 insertions(+), 200 deletions(-)

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