[Pkg-owncloud-commits] [php-sabredav] 11/148: Merge branch 'master' into xml-rewrite2

David Prévot taffit at moszumanska.debian.org
Wed Apr 15 01:37:01 UTC 2015


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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 6567b3e3495d3ad57927281adc7e525e9dc9c311
Merge: 40e107c 322812d
Author: Evert Pot <me at evertpot.com>
Date:   Fri Jan 2 18:29:17 2015 -0500

    Merge branch 'master' into xml-rewrite2
    
    Conflicts:
    	lib/DAV/Property/GetLastModified.php
    	lib/DAV/Property/HrefList.php
    	lib/DAV/Property/ResourceType.php
    	lib/DAV/Property/ResponseList.php
    	lib/DAV/Property/SupportedLock.php
    	lib/DAV/Property/SupportedMethodSet.php
    	lib/DAV/Property/SupportedReportSet.php

 .travis.yml                                            | 12 ++++++++----
 LICENSE                                                |  2 +-
 README.md                                              | 18 +++++++++---------
 lib/CalDAV/Backend/AbstractBackend.php                 |  2 +-
 lib/CalDAV/Backend/BackendInterface.php                |  2 +-
 lib/CalDAV/Backend/NotificationSupport.php             |  2 +-
 lib/CalDAV/Backend/PDO.php                             |  2 +-
 lib/CalDAV/Backend/SchedulingSupport.php               |  2 +-
 lib/CalDAV/Backend/SharingSupport.php                  |  2 +-
 lib/CalDAV/Backend/SubscriptionSupport.php             |  2 +-
 lib/CalDAV/Backend/SyncSupport.php                     |  2 +-
 lib/CalDAV/Calendar.php                                |  2 +-
 lib/CalDAV/CalendarHome.php                            |  2 +-
 lib/CalDAV/CalendarObject.php                          |  2 +-
 lib/CalDAV/CalendarQueryParser.php                     |  2 +-
 lib/CalDAV/CalendarQueryValidator.php                  |  2 +-
 lib/CalDAV/CalendarRoot.php                            |  2 +-
 lib/CalDAV/Exception/InvalidComponentType.php          |  2 +-
 lib/CalDAV/ICSExportPlugin.php                         |  2 +-
 lib/CalDAV/ICalendar.php                               |  2 +-
 lib/CalDAV/ICalendarObject.php                         |  2 +-
 lib/CalDAV/ICalendarObjectContainer.php                |  2 +-
 lib/CalDAV/IShareableCalendar.php                      |  2 +-
 lib/CalDAV/ISharedCalendar.php                         |  2 +-
 lib/CalDAV/Notifications/Collection.php                |  2 +-
 lib/CalDAV/Notifications/ICollection.php               |  2 +-
 lib/CalDAV/Notifications/INode.php                     |  2 +-
 lib/CalDAV/Notifications/INotificationType.php         |  2 +-
 lib/CalDAV/Notifications/Node.php                      |  2 +-
 lib/CalDAV/Notifications/Notification/Invite.php       |  2 +-
 lib/CalDAV/Notifications/Notification/InviteReply.php  |  2 +-
 lib/CalDAV/Notifications/Notification/SystemStatus.php |  2 +-
 lib/CalDAV/Notifications/Plugin.php                    |  2 +-
 lib/CalDAV/Plugin.php                                  |  2 +-
 lib/CalDAV/Principal/Collection.php                    |  2 +-
 lib/CalDAV/Principal/IProxyRead.php                    |  2 +-
 lib/CalDAV/Principal/IProxyWrite.php                   |  2 +-
 lib/CalDAV/Principal/ProxyRead.php                     |  2 +-
 lib/CalDAV/Principal/ProxyWrite.php                    |  2 +-
 lib/CalDAV/Principal/User.php                          |  2 +-
 lib/CalDAV/Property/AllowedSharingModes.php            |  2 +-
 lib/CalDAV/Property/EmailAddressSet.php                |  2 +-
 lib/CalDAV/Property/Invite.php                         |  2 +-
 lib/CalDAV/Property/ScheduleCalendarTransp.php         |  2 +-
 lib/CalDAV/Property/SupportedCalendarComponentSet.php  |  2 +-
 lib/CalDAV/Property/SupportedCalendarData.php          |  2 +-
 lib/CalDAV/Property/SupportedCollationSet.php          |  2 +-
 lib/CalDAV/Schedule/IInbox.php                         |  2 +-
 lib/CalDAV/Schedule/IMipPlugin.php                     |  2 +-
 lib/CalDAV/Schedule/IOutbox.php                        |  2 +-
 lib/CalDAV/Schedule/ISchedulingObject.php              |  2 +-
 lib/CalDAV/Schedule/Inbox.php                          |  2 +-
 lib/CalDAV/Schedule/Outbox.php                         |  2 +-
 lib/CalDAV/Schedule/Plugin.php                         |  2 +-
 lib/CalDAV/Schedule/SchedulingObject.php               |  2 +-
 lib/CalDAV/ShareableCalendar.php                       |  2 +-
 lib/CalDAV/SharedCalendar.php                          |  2 +-
 lib/CalDAV/SharingPlugin.php                           |  2 +-
 lib/CalDAV/Subscriptions/ISubscription.php             |  2 +-
 lib/CalDAV/Subscriptions/Plugin.php                    |  2 +-
 lib/CalDAV/Subscriptions/Subscription.php              |  2 +-
 lib/CardDAV/AddressBook.php                            |  2 +-
 lib/CardDAV/AddressBookQueryParser.php                 |  2 +-
 lib/CardDAV/AddressBookRoot.php                        |  2 +-
 lib/CardDAV/Backend/AbstractBackend.php                |  2 +-
 lib/CardDAV/Backend/BackendInterface.php               |  2 +-
 lib/CardDAV/Backend/PDO.php                            |  2 +-
 lib/CardDAV/Backend/SyncSupport.php                    |  2 +-
 lib/CardDAV/Card.php                                   |  2 +-
 lib/CardDAV/IAddressBook.php                           |  2 +-
 lib/CardDAV/ICard.php                                  |  2 +-
 lib/CardDAV/IDirectory.php                             |  2 +-
 lib/CardDAV/Plugin.php                                 |  2 +-
 lib/CardDAV/Property/SupportedAddressData.php          |  2 +-
 lib/CardDAV/Property/SupportedCollationSet.php         |  2 +-
 lib/CardDAV/UserAddressBooks.php                       |  2 +-
 lib/CardDAV/VCFExportPlugin.php                        |  2 +-
 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/Auth/Backend/BasicCallBack.php                 |  2 +-
 lib/DAV/Auth/Backend/File.php                          |  2 +-
 lib/DAV/Auth/Backend/PDO.php                           |  2 +-
 lib/DAV/Auth/Plugin.php                                |  2 +-
 lib/DAV/Browser/GuessContentType.php                   |  2 +-
 lib/DAV/Browser/MapGetToPropFind.php                   |  2 +-
 lib/DAV/Browser/Plugin.php                             |  4 ++--
 lib/DAV/Browser/PropFindAll.php                        |  2 +-
 lib/DAV/Client.php                                     |  2 +-
 lib/DAV/Collection.php                                 |  2 +-
 lib/DAV/CorePlugin.php                                 |  2 +-
 lib/DAV/Exception.php                                  |  2 +-
 lib/DAV/Exception/BadRequest.php                       |  2 +-
 lib/DAV/Exception/Conflict.php                         |  2 +-
 lib/DAV/Exception/ConflictingLock.php                  |  2 +-
 lib/DAV/Exception/Forbidden.php                        |  2 +-
 lib/DAV/Exception/InsufficientStorage.php              |  2 +-
 lib/DAV/Exception/InvalidResourceType.php              |  2 +-
 lib/DAV/Exception/InvalidSyncToken.php                 |  2 +-
 lib/DAV/Exception/LengthRequired.php                   |  2 +-
 lib/DAV/Exception/LockTokenMatchesRequestUri.php       |  2 +-
 lib/DAV/Exception/Locked.php                           |  2 +-
 lib/DAV/Exception/MethodNotAllowed.php                 |  2 +-
 lib/DAV/Exception/NotAuthenticated.php                 |  2 +-
 lib/DAV/Exception/NotFound.php                         |  2 +-
 lib/DAV/Exception/NotImplemented.php                   |  2 +-
 lib/DAV/Exception/PaymentRequired.php                  |  2 +-
 lib/DAV/Exception/PreconditionFailed.php               |  2 +-
 lib/DAV/Exception/ReportNotSupported.php               |  2 +-
 lib/DAV/Exception/RequestedRangeNotSatisfiable.php     |  2 +-
 lib/DAV/Exception/ServiceUnavailable.php               |  2 +-
 lib/DAV/Exception/TooManyMatches.php                   |  2 +-
 lib/DAV/Exception/UnsupportedMediaType.php             |  2 +-
 lib/DAV/FS/Directory.php                               |  2 +-
 lib/DAV/FS/File.php                                    |  2 +-
 lib/DAV/FS/Node.php                                    |  2 +-
 lib/DAV/FSExt/Directory.php                            |  2 +-
 lib/DAV/FSExt/File.php                                 |  2 +-
 lib/DAV/FSExt/Node.php                                 |  2 +-
 lib/DAV/File.php                                       |  2 +-
 lib/DAV/ICollection.php                                |  2 +-
 lib/DAV/IExtendedCollection.php                        |  2 +-
 lib/DAV/IFile.php                                      |  2 +-
 lib/DAV/IMoveTarget.php                                |  2 +-
 lib/DAV/IMultiGet.php                                  |  2 +-
 lib/DAV/INode.php                                      |  2 +-
 lib/DAV/IProperties.php                                |  2 +-
 lib/DAV/IQuota.php                                     |  2 +-
 lib/DAV/Locks/Backend/AbstractBackend.php              |  2 +-
 lib/DAV/Locks/Backend/BackendInterface.php             |  2 +-
 lib/DAV/Locks/Backend/File.php                         |  2 +-
 lib/DAV/Locks/Backend/PDO.php                          |  2 +-
 lib/DAV/Locks/LockInfo.php                             |  2 +-
 lib/DAV/Locks/Plugin.php                               |  2 +-
 lib/DAV/Mount/Plugin.php                               |  2 +-
 lib/DAV/Node.php                                       |  2 +-
 lib/DAV/PartialUpdate/IPatchSupport.php                |  2 +-
 lib/DAV/PartialUpdate/Plugin.php                       |  2 +-
 lib/DAV/PropPatch.php                                  |  2 +-
 lib/DAV/Property.php                                   |  2 +-
 lib/DAV/Property/Href.php                              |  2 +-
 lib/DAV/Property/IHref.php                             |  2 +-
 lib/DAV/Property/LockDiscovery.php                     |  2 +-
 lib/DAV/Property/Response.php                          |  2 +-
 lib/DAV/PropertyInterface.php                          |  2 +-
 lib/DAV/Server.php                                     |  2 +-
 lib/DAV/ServerPlugin.php                               |  2 +-
 lib/DAV/SimpleCollection.php                           |  2 +-
 lib/DAV/SimpleFile.php                                 |  2 +-
 lib/DAV/StringUtil.php                                 |  2 +-
 lib/DAV/Sync/ISyncCollection.php                       |  2 +-
 lib/DAV/Sync/Plugin.php                                |  2 +-
 lib/DAV/TemporaryFileFilterPlugin.php                  |  2 +-
 lib/DAV/Tree.php                                       |  2 +-
 lib/DAV/UUIDUtil.php                                   |  2 +-
 lib/DAV/Version.php                                    |  2 +-
 lib/DAV/XMLUtil.php                                    |  2 +-
 lib/DAVACL/AbstractPrincipalCollection.php             |  2 +-
 lib/DAVACL/Exception/AceConflict.php                   |  2 +-
 lib/DAVACL/Exception/NeedPrivileges.php                |  2 +-
 lib/DAVACL/Exception/NoAbstract.php                    |  2 +-
 lib/DAVACL/Exception/NotRecognizedPrincipal.php        |  2 +-
 lib/DAVACL/Exception/NotSupportedPrivilege.php         |  2 +-
 lib/DAVACL/IACL.php                                    |  2 +-
 lib/DAVACL/IPrincipal.php                              |  2 +-
 lib/DAVACL/IPrincipalCollection.php                    |  2 +-
 lib/DAVACL/Plugin.php                                  |  2 +-
 lib/DAVACL/Principal.php                               |  2 +-
 lib/DAVACL/PrincipalBackend/AbstractBackend.php        |  2 +-
 lib/DAVACL/PrincipalBackend/BackendInterface.php       |  2 +-
 lib/DAVACL/PrincipalBackend/PDO.php                    |  2 +-
 lib/DAVACL/PrincipalCollection.php                     |  2 +-
 lib/DAVACL/Property/Acl.php                            |  2 +-
 lib/DAVACL/Property/AclRestrictions.php                |  2 +-
 lib/DAVACL/Property/CurrentUserPrivilegeSet.php        |  2 +-
 lib/DAVACL/Property/Principal.php                      |  2 +-
 lib/DAVACL/Property/SupportedPrivilegeSet.php          |  2 +-
 tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php |  2 +-
 tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php |  2 +-
 .../CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php    |  2 +-
 tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php    |  2 +-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php        |  2 +-
 tests/Sabre/CalDAV/Issue203Test.php                    |  2 +-
 tests/Sabre/CalDAV/Issue205Test.php                    |  2 +-
 tests/Sabre/CalDAV/Issue211Test.php                    |  2 +-
 tests/Sabre/CalDAV/Issue220Test.php                    |  2 +-
 tests/Sabre/CalDAV/Issue228Test.php                    |  2 +-
 tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php        |  2 +-
 tests/Sabre/DAV/HttpDeleteTest.php                     |  2 +-
 tests/Sabre/DAV/HttpPutTest.php                        |  2 +-
 tests/Sabre/DAV/Locks/Backend/Mock.php                 |  2 +-
 tests/Sabre/DAV/Mock/Collection.php                    |  2 +-
 tests/Sabre/DAV/Mock/File.php                          |  2 +-
 tests/Sabre/DAV/Mock/PropertiesCollection.php          |  2 +-
 tests/Sabre/DAV/Sync/MockSyncCollection.php            |  2 +-
 tests/Sabre/DAVServerTest.php                          |  2 +-
 tests/Sabre/HTTP/ResponseMock.php                      |  2 +-
 tests/Sabre/HTTP/SapiMock.php                          |  2 +-
 199 files changed, 215 insertions(+), 211 deletions(-)


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



More information about the Pkg-owncloud-commits mailing list