[Pkg-owncloud-commits] [php-sabredav] 217/275: Merge branch '2.0'

[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 6963157566d107b0aadbe88fd71ee2c9b1eeb8ad
Merge: 7f0b4fd 997fa00
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Sep 11 13:39:13 2014 +0100

    Merge branch '2.0'
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 ChangeLog.md                               |  6 +++
 lib/CalDAV/Backend/PDO.php                 |  6 +--
 lib/DAV/Server.php                         |  1 +
 tests/Sabre/DAV/ServerPreconditionTest.php | 81 ++++++++++++------------------
 tests/Sabre/HTTP/SapiMock.php              |  6 ++-
 5 files changed, 46 insertions(+), 54 deletions(-)

diff --cc ChangeLog.md
index 9bf2a9e,176a742..262f5b6
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,60 -1,12 +1,66 @@@
  ChangeLog
  =========
  
 +2.1.0-alpha1 (2014-??-??)
 +-------------------------
 +
 +* Added: Support for [rfc6638][rfc6638], also known as CalDAV Scheduling.
 +* Added: Automatically converting between vCard 3, 4 and jCard using the
 +  `Accept:` header, in CardDAV reports, and automatically converting from
 +  jCard to vCard upon `PUT`. It's important to note that your backends _may_
 +  now recieve both vCard 3.0 and 4.0.
 +* Changed: PropertyStorage backends now have a `move` method.
 +* Added: `beforeMove`, and `afterMove` events.
 +* Changed: A few database changes for the CalDAV PDO backend. Make sure you
 +  run `bin/migrate21.php` to upgrade your database schema.
 +* Changed: CalDAV backends have a new method: `getCalendarObjectByUID`. This
 +  method MUST be implemented by all backends, but the `AbstractBackend` has a
 +  simple default implementation for this.
 +* Changed: `Sabre\CalDAV\UserCalendars` has been renamed to
 +  `Sabre\CalDAV\CalendarHome`.
 +* Changed: `Sabre\CalDAV\CalendarRootNode` has been renamed to
 +  `Sabre\CalDAV\CalendarRoot`.
 +* Changed: The IMipHandler has been completely removed. With CalDAV scheduling
 +  support, it is no longer needed. It's functionality has been replaced by
 +  `Sabre\CalDAV\Schedule\IMipPlugin`, which can now send emails for clients
 +  other than iCal.
 +* Added: Support for the `{http://calendarserver.org/ns/}email-address-set`
 +  property.
 +* #460: PropertyStorage must move properties during `MOVE` requests.
 +* Changed: Restructured the zip distribution to be a little bit more lean
 +  and consistent.
 +* #472: Always returning lock tokens in the lockdiscovery property.
 +* Directory entries in the Browser plugin are sorted by type and name.
 +  (@aklomp)
 +* #486: It's now possible to return additional properties when an 'allprop'
 +  PROPFIND request is being done. (@aklomp)
 +* Changed: Now return HTTP errors when an addressbook-query REPORT is done
 +  on a uri that's not a vcard. This should help with debugging this common
 +  mistake.
 +* Changed: `PUT` requests with a `Content-Range` header now emit a 400 status
 +  instead of 501, as per RFC7231.
 +* Added: Browser plugin can now display the contents of the
 +  `{DAV:}supported-privilege-set` property.
 +* Added: Now reporting `CALDAV:max-resource-size`, but we're not actively
 +  restricting it yet.
 +* Changed: CalDAV plugin is now responsible for reporting
 +  `CALDAV:supported-collation-set` and `CALDAV:supported-calendar-data`
 +  properties.
 +* Added: Now reporting `CARDDAV:max-resource-size`, but we're not actively
 +  restricting it yet.
 +* Added: Support for `CARDDAV:supported-collation-set`.
 +* Changed: CardDAV plugin is now responsible for reporting
 +  `CARDDAV:supported-address-data`. This functionality has been removed from
 +  the CardDAV PDO backend.
 +* When a REPORT is not supported, we now emit HTTP error 415, instead of 403.
 +* `HEAD` requests now work wherever `GET` also works.
 +
+ 2.0.5 (????-??-??)
+ ------------------
+ 
+ * #514: CalDAV PDO backend didn't work when overriding the 'calendar changes'
+   database table name.
+ * #515: 304 status code was not being sent when checking preconditions.
  
  2.0.4 (2014-08-27)
  ------------------
diff --cc lib/CalDAV/Backend/PDO.php
index a354854,8237227..de8a51f
mode 100755,100644..100755
--- a/lib/CalDAV/Backend/PDO.php
+++ b/lib/CalDAV/Backend/PDO.php

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