[Pkg-owncloud-commits] [php-sabredav] 54/75: Merge branch '2.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 cee993337f1266609eff4d774ac6e4e5bdb1aecc
Merge: dbe8a64 ff814c3
Author: Evert Pot <me at evertpot.com>
Date:   Mon Feb 23 16:07:20 2015 -0500

    Merge branch '2.1'
    
    Conflicts:
    	CHANGELOG.md

 CHANGELOG.md                                       |  6 +++++
 lib/DAV/Browser/Plugin.php                         |  2 +-
 .../PropertyStorage/Backend/BackendInterface.php   | 16 +++++++++++
 lib/DAV/PropertyStorage/Backend/PDO.php            | 31 ++++++++++++++++++++--
 lib/DAV/PropertyStorage/Plugin.php                 | 15 +++++++++++
 .../PropertyStorage/Backend/AbstractPDOTest.php    | 17 ++++++++++++
 6 files changed, 84 insertions(+), 3 deletions(-)

diff --cc CHANGELOG.md
index 4cd8cf3,74da72d..6e2b7b6
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -48,7 -7,12 +48,13 @@@ ChangeLo
  * #586: SCHEDULE-STATUS should not contain a reason-phrase.
  * #539: Fixed a bug related to scheduling in shared calendars.
  * #595: Support for calendar-timezone in iCalendar exports.
 +* #581: findByUri would send empty prefixes to the principal backend (@soydeedo)
+ * #611: Escaping a bit more HTML output in the browser plugin. (@LukasReschke)
+ * #610: Don't allow discovery of arbitrary files using `..` in the browser
+   plugin (@LukasReschke).
+ * Browser plugin now shows quota properties.
+ * #612: PropertStorage didn't delete properties from nodes when a node's
+   parents get deleted.
  
  
  2.1.2 (2014-12-10)

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