[Pkg-owncloud-commits] [php-sabredav] 178/275: Merge pull request #505 from fruux/vcard-convert

[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 cde96c3aad1fd68985f1d025e5e88dbcc2910154
Merge: 8f30f2b cacae82
Author: Evert Pot <me at evertpot.com>
Date:   Fri Aug 22 18:48:45 2014 -0400

    Merge pull request #505 from fruux/vcard-convert
    
    Vcard convert

 ChangeLog.md                                       |   5 +
 composer.json                                      |   2 +-
 lib/CalDAV/Plugin.php                              |  74 +++---
 lib/CardDAV/AddressBook.php                        |  40 ++--
 lib/CardDAV/AddressBookQueryParser.php             |  24 +-
 lib/CardDAV/AddressBookRoot.php                    |   6 +-
 lib/CardDAV/Backend/AbstractBackend.php            |   2 +-
 lib/CardDAV/Backend/BackendInterface.php           |  20 +-
 lib/CardDAV/Backend/PDO.php                        |  42 ++--
 lib/CardDAV/Backend/SyncSupport.php                |   2 +-
 lib/CardDAV/Card.php                               |  42 ++--
 lib/CardDAV/IAddressBook.php                       |   2 -
 lib/CardDAV/IDirectory.php                         |   1 -
 lib/CardDAV/Plugin.php                             | 247 ++++++++++++++++++---
 lib/CardDAV/Property/SupportedAddressData.php      |  15 +-
 lib/CardDAV/Property/SupportedCollationSet.php     |   2 +-
 lib/CardDAV/UserAddressBooks.php                   |  45 ++--
 lib/CardDAV/VCFExportPlugin.php                    |  10 +-
 lib/DAV/Exception/ReportNotSupported.php           |   2 +-
 tests/Sabre/CalDAV/PluginTest.php                  |   2 +-
 tests/Sabre/CardDAV/AddressBookQueryTest.php       | 116 ++++++++++
 tests/Sabre/CardDAV/CardTest.php                   |   2 +-
 tests/Sabre/CardDAV/MultiGetTest.php               |  46 +++-
 tests/Sabre/CardDAV/PluginTest.php                 |  35 ++-
 .../CardDAV/Property/SupportedAddressDataTest.php  |   3 +-
 ...sDataTest.php => SupportedCollationSetTest.php} |  13 +-
 tests/Sabre/CardDAV/SogoStripContentTypeTest.php   |   2 +-
 tests/Sabre/CardDAV/ValidateVCardTest.php          |  24 +-
 tests/Sabre/DAV/Auth/PluginTest.php                |   2 +-
 tests/Sabre/DAV/ServerSimpleTest.php               |   2 +-
 tests/Sabre/DAV/Sync/PluginTest.php                |   4 +-
 31 files changed, 612 insertions(+), 222 deletions(-)

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