[Pkg-owncloud-commits] [php-sabredav] 18/42: Merge branch '2.1' of github.com:fruux/sabre-dav into 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 e0290e7e68ead0c20bdeeb0e4684aa5af073236b
Merge: 6b0555a e608d49
Author: Evert Pot <me at evertpot.com>
Date:   Fri Nov 14 16:51:17 2014 -0500

    Merge branch '2.1' of github.com:fruux/sabre-dav into 2.1
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                                       |   6 +
 composer.json                                      |   2 +-
 lib/CalDAV/Plugin.php                              | 100 +++++++++---
 lib/CalDAV/Schedule/Plugin.php                     |  14 +-
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 170 +++++++++++++++++++++
 tests/Sabre/CalDAV/FreeBusyReportTest.php          |  29 +++-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |   3 +-
 7 files changed, 296 insertions(+), 28 deletions(-)

diff --cc ChangeLog.md
index e7318b9,b27eadf..e00e320
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -6,8 -6,12 +6,14 @@@ ChangeLo
  
  * #541: CalDAV PDO backend didn't respect overridden PDO table names.
  * #550: Scheduling invites are no longer delivered into shared calendars.
 +* #554: `calendar-multiget` `REPORT` did not work on inbox items.
+ * #555: The `calendar-timezone` property is now respected for floating times
+   and all-day events in the `calendar-query`, `calendar-multiget` and
+   `free-busy-query` REPORTs.
+ * #555: The `calendar-timezone` property is also respected for scheduling
+   free-busy requests.
+ 
 +
  2.1.0-alpha2 (2014-10-23)
  -------------------------
  

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