[Pkg-owncloud-commits] [php-sabredav] 204/275: Merge branch 'master' into move
David Prévot
taffit at moszumanska.debian.org
Thu Sep 25 14:56:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit e1c3632f085e1c871b8c1e2a3dc3deacf0252edf
Merge: b9ae0ba 42d809e
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Sat Aug 30 14:25:10 2014 +0200
Merge branch 'master' into move
Conflicts:
lib/DAV/FSExt/Directory.php
lib/DAV/ObjectTree.php
lib/DAV/Tree.php
lib/DAV/Tree/Filesystem.php
lib/CalDAV/Backend/AbstractBackend.php | 10 ++--
lib/CalDAV/Backend/BackendInterface.php | 24 ++++-----
lib/CalDAV/Backend/NotificationSupport.php | 4 +-
lib/CalDAV/Backend/PDO.php | 42 +++++++--------
lib/CalDAV/Backend/SchedulingSupport.php | 8 +--
lib/CalDAV/Backend/SubscriptionSupport.php | 8 +--
lib/CalDAV/Calendar.php | 52 +++++++++---------
lib/CalDAV/CalendarHome.php | 62 +++++++++++-----------
lib/CalDAV/CalendarObject.php | 52 +++++++++---------
lib/CalDAV/CalendarQueryParser.php | 32 +++++------
lib/CalDAV/CalendarQueryValidator.php | 2 +-
lib/CalDAV/CalendarRoot.php | 6 +--
lib/CalDAV/Exception/InvalidComponentType.php | 2 +-
lib/CalDAV/ICSExportPlugin.php | 6 +--
lib/CalDAV/ICalendar.php | 1 -
lib/CalDAV/ICalendarObject.php | 1 -
lib/CalDAV/ICalendarObjectContainer.php | 3 +-
lib/CalDAV/Notifications/Collection.php | 30 +++++------
lib/CalDAV/Notifications/ICollection.php | 1 -
lib/CalDAV/Notifications/Node.php | 32 +++++------
lib/CalDAV/Notifications/Notification/Invite.php | 14 ++---
.../Notifications/Notification/InviteReply.php | 14 ++---
.../Notifications/Notification/SystemStatus.php | 10 ++--
lib/CalDAV/Principal/Collection.php | 2 +-
lib/CalDAV/Principal/ProxyRead.php | 24 ++++-----
lib/CalDAV/Principal/ProxyWrite.php | 22 ++++----
lib/CalDAV/Principal/User.php | 22 ++++----
lib/CalDAV/Property/AllowedSharingModes.php | 4 +-
lib/CalDAV/Property/EmailAddressSet.php | 6 +--
lib/CalDAV/Property/Invite.php | 6 +--
lib/CalDAV/Property/ScheduleCalendarTransp.php | 6 +--
.../Property/SupportedCalendarComponentSet.php | 6 +--
lib/CalDAV/Property/SupportedCalendarData.php | 2 +-
lib/CalDAV/Property/SupportedCollationSet.php | 2 +-
lib/CalDAV/Schedule/IMipPlugin.php | 8 +--
lib/CalDAV/Schedule/IOutbox.php | 1 -
lib/CalDAV/Schedule/ISchedulingObject.php | 1 -
lib/CalDAV/Schedule/Inbox.php | 20 +++----
lib/CalDAV/Schedule/Outbox.php | 26 ++++-----
lib/CalDAV/Schedule/Plugin.php | 24 ++++-----
lib/CalDAV/Schedule/SchedulingObject.php | 53 +++++++++---------
lib/CalDAV/ShareableCalendar.php | 6 +--
lib/CalDAV/SharedCalendar.php | 12 ++---
lib/CalDAV/SharingPlugin.php | 46 ++++++++--------
lib/CalDAV/Subscriptions/Plugin.php | 6 +--
lib/CalDAV/Subscriptions/Subscription.php | 24 ++++-----
lib/DAV/Auth/Backend/AbstractBasic.php | 4 +-
lib/DAV/Auth/Backend/AbstractDigest.php | 6 +--
lib/DAV/Auth/Backend/Apache.php | 4 +-
lib/DAV/Auth/Backend/BasicCallBack.php | 2 +-
lib/DAV/Auth/Backend/File.php | 8 +--
lib/DAV/Auth/Backend/PDO.php | 6 +--
lib/DAV/Auth/Plugin.php | 14 ++---
lib/DAV/Browser/GuessContentType.php | 8 +--
lib/DAV/Browser/MapGetToPropFind.php | 4 +-
lib/DAV/Browser/Plugin.php | 14 ++---
lib/DAV/Browser/PropFindAll.php | 12 ++---
lib/DAV/Client.php | 48 ++++++++---------
lib/DAV/Collection.php | 8 +--
lib/DAV/Exception.php | 8 +--
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 | 4 +-
lib/DAV/Exception/Locked.php | 6 +--
lib/DAV/Exception/MethodNotAllowed.php | 8 +--
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 | 6 +--
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/FSExt/Node.php | 8 +--
lib/DAV/File.php | 10 ++--
lib/DAV/IMultiGet.php | 2 +-
lib/DAV/IProperties.php | 4 +-
lib/DAV/Locks/Backend/BackendInterface.php | 6 +--
lib/DAV/Locks/Backend/FS.php | 14 ++---
lib/DAV/Locks/Backend/File.php | 14 ++---
lib/DAV/Locks/Backend/PDO.php | 34 ++++++++----
lib/DAV/Locks/Plugin.php | 34 ++++++------
lib/DAV/Mount/Plugin.php | 6 +--
lib/DAV/Node.php | 6 +--
lib/DAV/PartialUpdate/Plugin.php | 34 ++++++------
lib/DAV/PropFind.php | 24 ++++-----
lib/DAV/PropPatch.php | 18 +++----
lib/DAV/Property/GetLastModified.php | 6 +--
lib/DAV/Property/Href.php | 6 +--
lib/DAV/Property/HrefList.php | 8 +--
lib/DAV/Property/LockDiscovery.php | 4 +-
lib/DAV/Property/ResourceType.php | 20 +++----
lib/DAV/Property/Response.php | 12 ++---
lib/DAV/Property/ResponseList.php | 10 ++--
lib/DAV/Property/SupportedLock.php | 4 +-
lib/DAV/Property/SupportedMethodSet.php | 6 +--
lib/DAV/Property/SupportedReportSet.php | 14 ++---
lib/DAV/PropertyInterface.php | 4 +-
.../PropertyStorage/Backend/BackendInterface.php | 8 +--
lib/DAV/PropertyStorage/Backend/PDO.php | 10 ++--
lib/DAV/PropertyStorage/Plugin.php | 12 ++---
lib/DAV/ServerPlugin.php | 10 ++--
lib/DAV/SimpleCollection.php | 12 ++---
lib/DAV/SimpleFile.php | 14 ++---
lib/DAV/StringUtil.php | 6 +--
lib/DAV/Sync/ISyncCollection.php | 4 +-
lib/DAV/Sync/Plugin.php | 24 ++++-----
lib/DAV/TemporaryFileFilterPlugin.php | 20 +++----
lib/DAV/XMLUtil.php | 10 ++--
lib/DAVACL/Property/Acl.php | 8 +--
lib/DAVACL/Property/AclRestrictions.php | 2 +-
120 files changed, 704 insertions(+), 695 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