<p dir="ltr">[Pkg-owncloud-commits] [php-sabredav] 36/66: Merge branch '1.7' into 1.8<br>
David Prévot taffit at <a href="http://moszumanska.debian.org">moszumanska.debian.org</a> <br>
Sat Jan 18 20:08:21 UTC 2014<br>
Previous message: [Pkg-owncloud-commits] [php-sabredav] 35/66: Happy new year :)<br>
Next message: [Pkg-owncloud-commits] [php-sabredav] 37/66: Happy new year!<br>
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]<br>
This is an automated email from the git hooks/post-receive script.</p>
<p dir="ltr">taffit pushed a commit to branch master<br>
in repository php-sabredav.</p>
<p dir="ltr">commit 091017a2d7cc05babf29461dfb581a36b82b39d1<br>
Merge: b42e697 f204a20<br>
Author: Evert Pot <evert at <a href="http://rooftopsolutions.nl">rooftopsolutions.nl</a>><br>
Date: Thu Jan 2 12:28:08 2014 +0100</p>
<p dir="ltr"> Merge branch '1.7' into 1.8<br>
<br>
Conflicts:<br>
ChangeLog<br>
LICENSE<br>
lib/Sabre/CalDAV/Backend/AbstractBackend.php<br>
lib/Sabre/CalDAV/Backend/BackendInterface.php<br>
lib/Sabre/CalDAV/Backend/NotificationSupport.php<br>
lib/Sabre/CalDAV/Backend/PDO.php<br>
lib/Sabre/CalDAV/Backend/SharingSupport.php<br>
lib/Sabre/CalDAV/Calendar.php<br>
lib/Sabre/CalDAV/CalendarObject.php<br>
lib/Sabre/CalDAV/CalendarQueryParser.php<br>
lib/Sabre/CalDAV/CalendarQueryValidator.php<br>
lib/Sabre/CalDAV/CalendarRootNode.php<br>
lib/Sabre/CalDAV/Exception/InvalidComponentType.php<br>
lib/Sabre/CalDAV/ICSExportPlugin.php<br>
lib/Sabre/CalDAV/ICalendar.php<br>
lib/Sabre/CalDAV/ICalendarObject.php<br>
lib/Sabre/CalDAV/IShareableCalendar.php<br>
lib/Sabre/CalDAV/ISharedCalendar.php<br>
lib/Sabre/CalDAV/Notifications/Collection.php<br>
lib/Sabre/CalDAV/Notifications/ICollection.php<br>
lib/Sabre/CalDAV/Notifications/INode.php<br>
lib/Sabre/CalDAV/Notifications/INotificationType.php<br>
lib/Sabre/CalDAV/Notifications/Node.php<br>
lib/Sabre/CalDAV/Notifications/Notification/Invite.php<br>
lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php<br>
lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php<br>
lib/Sabre/CalDAV/Plugin.php<br>
lib/Sabre/CalDAV/Principal/Collection.php<br>
lib/Sabre/CalDAV/Principal/ProxyRead.php<br>
lib/Sabre/CalDAV/Principal/ProxyWrite.php<br>
lib/Sabre/CalDAV/Principal/User.php<br>
lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php<br>
lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php<br>
lib/Sabre/CalDAV/Property/SupportedCalendarData.php<br>
lib/Sabre/CalDAV/Property/SupportedCollationSet.php<br>
lib/Sabre/CalDAV/Schedule/IMip.php<br>
lib/Sabre/CalDAV/Schedule/IOutbox.php<br>
lib/Sabre/CalDAV/Schedule/Outbox.php<br>
lib/Sabre/CalDAV/ShareableCalendar.php<br>
lib/Sabre/CalDAV/SharedCalendar.php<br>
lib/Sabre/CalDAV/SharingPlugin.php<br>
lib/Sabre/CalDAV/UserCalendars.php<br>
lib/Sabre/CalDAV/Version.php<br>
lib/Sabre/CalDAV/includes.php<br>
lib/Sabre/CardDAV/AddressBook.php<br>
lib/Sabre/CardDAV/AddressBookQueryParser.php<br>
lib/Sabre/CardDAV/AddressBookRoot.php<br>
lib/Sabre/CardDAV/Backend/BackendInterface.php<br>
lib/Sabre/CardDAV/Backend/PDO.php<br>
lib/Sabre/CardDAV/Card.php<br>
lib/Sabre/CardDAV/IAddressBook.php<br>
lib/Sabre/CardDAV/ICard.php<br>
lib/Sabre/CardDAV/IDirectory.php<br>
lib/Sabre/CardDAV/Plugin.php<br>
lib/Sabre/CardDAV/Property/SupportedAddressData.php<br>
lib/Sabre/CardDAV/UserAddressBooks.php<br>
lib/Sabre/CardDAV/VCFExportPlugin.php<br>
lib/Sabre/CardDAV/Version.php<br>
lib/Sabre/CardDAV/includes.php<br>
lib/Sabre/DAV/Auth/Backend/AbstractBasic.php<br>
lib/Sabre/DAV/Auth/Backend/AbstractDigest.php<br>
lib/Sabre/DAV/Auth/Backend/Apache.php<br>
lib/Sabre/DAV/Auth/Backend/BackendInterface.php<br>
lib/Sabre/DAV/Auth/Backend/File.php<br>
lib/Sabre/DAV/Auth/Backend/PDO.php<br>
lib/Sabre/DAV/Auth/Plugin.php<br>
lib/Sabre/DAV/Browser/GuessContentType.php<br>
lib/Sabre/DAV/Browser/MapGetToPropFind.php<br>
lib/Sabre/DAV/Browser/Plugin.php<br>
lib/Sabre/DAV/Client.php<br>
lib/Sabre/DAV/Collection.php<br>
lib/Sabre/DAV/Exception.php<br>
lib/Sabre/DAV/Exception/BadRequest.php<br>
lib/Sabre/DAV/Exception/Conflict.php<br>
lib/Sabre/DAV/Exception/ConflictingLock.php<br>
lib/Sabre/DAV/Exception/FileNotFound.php<br>
lib/Sabre/DAV/Exception/Forbidden.php<br>
lib/Sabre/DAV/Exception/InsufficientStorage.php<br>
lib/Sabre/DAV/Exception/InvalidResourceType.php<br>
lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php<br>
lib/Sabre/DAV/Exception/Locked.php<br>
lib/Sabre/DAV/Exception/MethodNotAllowed.php<br>
lib/Sabre/DAV/Exception/NotAuthenticated.php<br>
lib/Sabre/DAV/Exception/NotFound.php<br>
lib/Sabre/DAV/Exception/NotImplemented.php<br>
lib/Sabre/DAV/Exception/PaymentRequired.php<br>
lib/Sabre/DAV/Exception/PreconditionFailed.php<br>
lib/Sabre/DAV/Exception/ReportNotSupported.php<br>
lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php<br>
lib/Sabre/DAV/Exception/UnsupportedMediaType.php<br>
lib/Sabre/DAV/FS/Directory.php<br>
lib/Sabre/DAV/FS/File.php<br>
lib/Sabre/DAV/FS/Node.php<br>
lib/Sabre/DAV/FSExt/Directory.php<br>
lib/Sabre/DAV/FSExt/File.php<br>
lib/Sabre/DAV/FSExt/Node.php<br>
lib/Sabre/DAV/File.php<br>
lib/Sabre/DAV/ICollection.php<br>
lib/Sabre/DAV/IExtendedCollection.php<br>
lib/Sabre/DAV/IFile.php<br>
lib/Sabre/DAV/INode.php<br>
lib/Sabre/DAV/IProperties.php<br>
lib/Sabre/DAV/IQuota.php<br>
lib/Sabre/DAV/Locks/Backend/BackendInterface.php<br>
lib/Sabre/DAV/Locks/Backend/File.php<br>
lib/Sabre/DAV/Locks/Backend/PDO.php<br>
lib/Sabre/DAV/Locks/LockInfo.php<br>
lib/Sabre/DAV/Locks/Plugin.php<br>
lib/Sabre/DAV/Mount/Plugin.php<br>
lib/Sabre/DAV/Node.php<br>
lib/Sabre/DAV/ObjectTree.php<br>
lib/Sabre/DAV/PartialUpdate/IFile.php<br>
lib/Sabre/DAV/PartialUpdate/Plugin.php<br>
lib/Sabre/DAV/Property.php<br>
lib/Sabre/DAV/Property/GetLastModified.php<br>
lib/Sabre/DAV/Property/Href.php<br>
lib/Sabre/DAV/Property/HrefList.php<br>
lib/Sabre/DAV/Property/IHref.php<br>
lib/Sabre/DAV/Property/LockDiscovery.php<br>
lib/Sabre/DAV/Property/ResourceType.php<br>
lib/Sabre/DAV/Property/Response.php<br>
lib/Sabre/DAV/Property/ResponseList.php<br>
lib/Sabre/DAV/Property/SupportedLock.php<br>
lib/Sabre/DAV/Property/SupportedReportSet.php<br>
lib/Sabre/DAV/PropertyInterface.php<br>
lib/Sabre/DAV/Server.php<br>
lib/Sabre/DAV/ServerPlugin.php<br>
lib/Sabre/DAV/SimpleCollection.php<br>
lib/Sabre/DAV/SimpleFile.php<br>
lib/Sabre/DAV/StringUtil.php<br>
lib/Sabre/DAV/TemporaryFileFilterPlugin.php<br>
lib/Sabre/DAV/Tree.php<br>
lib/Sabre/DAV/Tree/Filesystem.php<br>
lib/Sabre/DAV/URLUtil.php<br>
lib/Sabre/DAV/UUIDUtil.php<br>
lib/Sabre/DAV/Version.php<br>
lib/Sabre/DAV/XMLUtil.php<br>
lib/Sabre/DAV/includes.php<br>
lib/Sabre/DAVACL/AbstractPrincipalCollection.php<br>
lib/Sabre/DAVACL/Exception/AceConflict.php<br>
lib/Sabre/DAVACL/Exception/NeedPrivileges.php<br>
lib/Sabre/DAVACL/Exception/NoAbstract.php<br>
lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php<br>
lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php<br>
lib/Sabre/DAVACL/IACL.php<br>
lib/Sabre/DAVACL/IPrincipal.php<br>
lib/Sabre/DAVACL/Plugin.php<br>
lib/Sabre/DAVACL/Principal.php<br>
lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php<br>
lib/Sabre/DAVACL/PrincipalBackend/PDO.php<br>
lib/Sabre/DAVACL/PrincipalCollection.php<br>
lib/Sabre/DAVACL/Property/Acl.php<br>
lib/Sabre/DAVACL/Property/AclRestrictions.php<br>
lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php<br>
lib/Sabre/DAVACL/Property/Principal.php<br>
lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php<br>
lib/Sabre/DAVACL/Version.php<br>
lib/Sabre/DAVACL/includes.php<br>
lib/Sabre/HTTP/AWSAuth.php<br>
lib/Sabre/HTTP/AbstractAuth.php<br>
lib/Sabre/HTTP/BasicAuth.php<br>
lib/Sabre/HTTP/DigestAuth.php<br>
lib/Sabre/HTTP/Request.php<br>
lib/Sabre/HTTP/Response.php<br>
lib/Sabre/HTTP/Util.php<br>
lib/Sabre/HTTP/Version.php<br>
lib/Sabre/HTTP/includes.php<br>
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php<br>
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php<br>
tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php<br>
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php<br>
tests/Sabre/CalDAV/Issue203Test.php<br>
tests/Sabre/CalDAV/Issue205Test.php<br>
tests/Sabre/CalDAV/Issue211Test.php<br>
tests/Sabre/CalDAV/Issue220Test.php<br>
tests/Sabre/CalDAV/Issue228Test.php<br>
tests/Sabre/CalDAV/Schedule/IMip/Mock.php<br>
tests/Sabre/DAVServerTest.php</p>
<p dir="ltr"> ChangeLog | 2 +-<br>
LICENSE | 2 +-<br>
lib/Sabre/CalDAV/Property/AllowedSharingModes.php | 2 +-<br>
lib/Sabre/CalDAV/Property/Invite.php | 2 +-<br>
lib/Sabre/DAV/Exception/ServiceUnavailable.php | 2 +-<br>
lib/Sabre/DAV/Locks/Backend/FS.php | 2 +-<br>
lib/Sabre/autoload.php | 2 +-<br>
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php | 4 ++--<br>
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php | 5 ++---<br>
tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php | 4 ++--<br>
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php | 5 ++---<br>
tests/Sabre/CalDAV/Issue203Test.php | 4 ++--<br>
tests/Sabre/CalDAV/Issue205Test.php | 5 ++---<br>
tests/Sabre/CalDAV/Issue211Test.php | 5 ++---<br>
tests/Sabre/CalDAV/Issue220Test.php | 5 ++---<br>
tests/Sabre/CalDAV/Issue228Test.php | 4 ++--<br>
tests/Sabre/CalDAV/Schedule/IMip/Mock.php | 6 ++----<br>
tests/Sabre/DAVServerTest.php | 5 ++---<br>
18 files changed, 29 insertions(+), 37 deletions(-)</p>
<p dir="ltr">diff --cc ChangeLog<br>
index 671212f,505b87e..57c9296<br>
--- a/ChangeLog<br>
+++ b/ChangeLog<br>
@@@ -1,58 -1,4 +1,58 @@@<br>
+1.8.8-stable (2013-??-??)<br>
+ * includes changes from version 1.7.10.<br>
+<br>
+1.8.7-stable (2013-10-02)<br>
+ * the zip release ships with sabre/vobject 2.1.3.<br>
+ * includes changes from version 1.7.9.<br>
+<br>
+1.8.6-stable (2013-06-18)<br>
+ * The zip release ships with sabre/vobject 2.1.0.<br>
+ * Includes changes from version 1.7.8.<br>
+<br>
+1.8.5-stable (2013-04-11)<br>
+ * The zip release ships with sabre/vobject 2.0.7.<br>
+ * Includes changes from version 1.7.7.<br>
+<br>
+1.8.4-stable (2013-04-08)<br>
+ * The zip release ships with sabre/vobject 2.0.7.<br>
+ * Includes changes from version 1.7.6.<br>
+<br>
+1.8.3-stable (2013-03-01)<br>
+ * The zip release ships with sabre/vobject 2.0.6.<br>
+ * Includes changes from version 1.7.5.<br>
+ * Fixed: organizer email-address for sha</p>
<p dir="ltr">Thank You<br>
Aaron Perkins<br>
Albuquerque NM</p>