[Pkg-owncloud-commits] [php-sabredav] 19/29: Merge branch '3.1'

[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 d8e1d44579ade6d22369254545a52e860f9e48ab
Merge: 91b31e8 0937db2
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jun 27 20:58:02 2016 -0400

    Merge branch '3.1'

 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --cc CHANGELOG.md
index 6212ec6,17dd60e..0441b53
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,86 -1,22 +1,104 @@@
  ChangeLog
  =========
  
 +3.2.0-beta2 (????-??-??)
 +------------------------
 +
 +* The default ACL rules allow an unauthenticated user to read information
 +  about nodes that don't have their own ACL defined. This was a security
 +  problem.
 +
 +
 +3.2.0-beta1 (2016-05-20)
 +------------------------
 +
 +* #833: Calendars throw exceptions when the sharing plugin is not enabled.
 +* #834: Return vCards exactly as they were stored if we don't need to convert
 +  in between versions.
++
++
+ 3.1.5 (????-??-??)
+ ------------------
+ 
+ * Fixed: Creating a new calendar on some MySQL configurations caused an error.
+ 
++
+ 3.1.4 (2016-05-28)
+ ------------------
+ 
+ * #834: Backport from `master`: Return vCards exactly as they were stored if
+   we don't need to convert in between versions. This should speed up many
+   large addressbook syncs sometimes up to 50%.
++>>>>>>> 3.1
  * The zip release ships with [sabre/vobject 4.1.0][vobj],
    [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
    [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.2][xml].
  
  
++<<<<<<< HEAD
 +3.2.0-alpha1 (2016-05-09)
 +-------------------------
 +
 +* Database changes for CalDAV. If you are using the CalDAV PDO backends, you
 +  must migrate. Run `./bin/migrateto32.php` for more info.
 +* Support for WebDAV Resource Sharing, an upcoming standard.
 +* Added support for sharing in the CalDAV PDO backend! Users can now invite
 +  others to their calendar and give them read/read-write access!
 +* #397: Support for PSR-3. You can now log exceptions with your favourite
 +  psr3-compatible logging tool.
 +* #825: Actual proper, tested support for PostgreSQL. We require version 9.5.
 +* Removed database migration script for sabre/dav 1.7. To update from that
 +  version you now first need to update to sabre/dav 3.1.
 +* Removed deprecated function: `Sabre\DAV\Auth\Plugin::getCurrentUser()`.
 +* #774: Fixes for getting free disk space on Windows.
 +* #803: Major changes in the sharing API. If you were using an old sabre/dav
 +  sharing api, head to the website for more detailed migration notes.
 +* #657: Support for optional auth using `{DAV:}unauthorized` and `{DAV:}all`
 +  privileges. This allows you to assign a privilege to a resource, allowing
 +  non-authenticated users to access it. For instance, this could allow you
 +  to create a public read-only collection.
 +* #812 #814: ICS/VCF exporter now includes a more useful filename in its
 +  `Content-Disposition` header. (@Xenopathic).
 +* #801: BC break: If you were using the `Href` object before, it's behavior
 +  now changed a bit, and `LocalHref` was added to replace the old, default
 +  behavior of `Href`. See the migration doc for more info.
 +* Removed `Sabre\DAVACL\Plugin::$allowAccessToNodesWithoutACL` setting.
 +  Instead, you can provide a set of default ACL rules with
 +  `Sabre\DAVACL\Plugin::setDefaultAcl()`.
 +* Introduced `Sabre\DAVACL\ACLTrait` which contains a default implementation
 +  of `Sabre\DAV\IACL` with some sane defaults. We're using this trait all over
 +  the place now, reducing the amount of boilerplate.
 +* Plugins can now control the "Supported Privilege Set".
 +* Added Sharing, ICSExport and VCFExport plugins to `groupwareserver.php`
 +  example.
 +* The `{DAV:}all` privilege is now no longer abstract, so it can be assigned
 +  directly. We're using the `{DAV:}all` privilege now in a lot of cases where
 +  we before assigned both `{DAV:}read` and `{DAV:}write`.
 +* Resources that are not collections no longer support the `{DAV:}bind` and
 +  `{DAV:}unbind` privileges.
 +* Corrected the CalDAV-scheduling related privileges.
 +* Doing an `UNLOCK` no longer requires the `{DAV:}write-content` privilege.
 +* Added a new `getPrincipalByUri` plugin event. Allowing plugins to request
 +  quickly where a principal lives on a server.
 +* Renamed `phpunit.xml` to `phpunit.xml.dist` to make local modifications easy.
 +* Functionality from `IShareableCalendar` is merged into `ISharedCalendar`.
 +* #751: Fixed XML responses from failing `MKCOL` requests.
 +* #600: Support for `principal-match` ACL `REPORT`.
 +* #599: Support for `acl-principal-prop-set` ACL `REPORT`.
 +* #798: Added an index on `firstoccurence` field in MySQL CalDAV backend. This
 +  should speed up common calendar-query requests.
 +* #759: DAV\Client is now able to actually correctly resolve relative urls.
 +* #671: We are no longer checking the `read-free-busy` privilege on individual
 +  calendars during freebusy operations in the scheduling plugin. Instead, we
 +  check the `schedule-query-freebusy` privilege on the target users' inbox,
 +  which validates access for the entire account, per the spec.
 +* The zip release ships with [sabre/vobject 4.1.0][vobj],
 +  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
 +  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
 +
 +
++=======
++>>>>>>> 3.1
  3.1.3 (2016-04-06)
  ------------------
  

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