[Pkg-owncloud-commits] [php-sabredav] 59/275: Merge branch 'master' of github.com:fruux/sabre-dav

[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 07621245f11f9925c66796a27f242eca57e68227
Merge: 46ab514 f8e7451
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Jun 10 13:47:53 2014 -0400

    Merge branch 'master' of github.com:fruux/sabre-dav
    
    Conflicts:
    	ChangeLog.md
    	lib/DAV/Version.php

 .travis.yml                                        |  2 +-
 ChangeLog.md                                       | 26 ++++++++++++++-
 README.md                                          |  1 +
 bin/build.php                                      | 35 ++++++++++++++++++--
 composer.json                                      |  3 +-
 examples/calendarserver.php                        |  2 +-
 examples/sql/pgsql.addressbook.sql                 | 23 +++++++++++--
 examples/sql/pgsql.calendars.sql                   | 26 ++++++++++++---
 examples/sql/pgsql.locks.sql                       | 12 +++++--
 examples/sql/pgsql.principals.sql                  |  2 +-
 examples/sql/pgsql.propertystorage.sql             | 12 +++++++
 examples/sql/pgsql.users.sql                       |  3 +-
 lib/DAV/CorePlugin.php                             |  7 ++++
 lib/DAV/PropFind.php                               |  2 ++
 .../PropertyStorage/Backend/BackendInterface.php   | 13 ++++++++
 lib/DAV/PropertyStorage/Backend/PDO.php            | 38 ++++++++++++++++++++++
 lib/DAV/PropertyStorage/Plugin.php                 | 24 ++++++++++++--
 lib/DAV/Server.php                                 |  4 ++-
 lib/DAV/Version.php                                |  2 +-
 tests/Sabre/DAV/Mount/PluginTest.php               |  2 +-
 tests/Sabre/DAV/PropFindTest.php                   |  9 -----
 .../PropertyStorage/Backend/AbstractPDOTest.php    | 34 +++++++++++++++++++
 tests/Sabre/DAV/PropertyStorage/Backend/Mock.php   | 30 +++++++++++++++++
 tests/Sabre/DAV/ServerPropsTest.php                | 38 ++++++++++++++++------
 24 files changed, 307 insertions(+), 43 deletions(-)

diff --cc ChangeLog.md
index f0e93a8,7e4770b..93e649d
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,9 -1,34 +1,33 @@@
  ChangeLog
  =========
  
- 2.1.0 (????-??-??)
+ 2.1.0-alpha1 (2014-??-??)
+ -------------------------
+ 
+ * Changed: PropertyStorage backends now have a `move` method.
+ * Added: `beforeMove`, and `afterMove` events.
+ * #460: PropertyStorage must move properties during MOVE requests
+ * Changed: Restructured the zip distribution to be a little bit more lean
+   and consistent.
+ 
+ 2.0.2 (2014-05-??)
  ------------------
  
+ * #467: Fixed a problem in `examples/calendarserver.php`.
+ * #466: All the postgresql sample files have been updated.
+ * Fixed: An error would be thrown if a client did a propfind on a node the
+   user didn't have access to.
+ 
+ 
+ 2.0.1 (2014-05-28)
+ ------------------
+ 
+ * #459: PROPFIND requests on Files with no Depth header would return a fatal
+   error.
+ * #464: A PROPFIND allprops request should not return properties with status
+   404.
+ 
+ 
 -
  2.0.0 (2014-05-22)
  ------------------
  

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