[Pkg-owncloud-commits] [php-sabre-vobject] 12/341: Merge branch '3.3'

[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-sabre-vobject.

commit 632d092f296500fc335b352a2e060f06d36edf6d
Merge: 2d8f6ec 3c27c21
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Sep 26 16:36:44 2014 +0100

    Merge branch '3.3'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                                   |  12 ++
 composer.json                                  |   8 +-
 lib/ITip/Broker.php                            |  64 ++++++++-
 lib/Version.php                                |   2 +-
 tests/VObject/ITip/BrokerAttendeeReplyTest.php | 184 +++++++++++++++++++++++++
 tests/VObject/ITip/BrokerDeleteEventTest.php   |   3 +
 tests/VObject/ITip/BrokerNewEventTest.php      |  18 +--
 tests/VObject/ITip/BrokerUpdateEventTest.php   | 102 ++++++--------
 8 files changed, 314 insertions(+), 79 deletions(-)

diff --cc ChangeLog.md
index 70d91fb,aaf914e..9695e51
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,16 -1,16 +1,28 @@@
  ChangeLog
  =========
  
 +3.4.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #139: We now accept `DateTimeInterface` whereever it accepted `DateTime`
 +   before in arguments. This means that either `DateTime` or
 +  `DateTimeImmutable` may be used everywhere.
 +* #139: We now _always_ return `DateTimeImmutable` from any method. This could
 +  potentially have big implications if you manipulate Date objects anywhere.
 +
++
+ 3.3.3 (2014-??-??)
+ ------------------
+ 
+ * #142: `CANCEL` and `REPLY` messages now include the `DTSTART` from the
+   original event.
+ * #143: `SCHEDULE-AGENT` on the `ORGANIZER` property is respected.
+ * #144: `PARTSTAT=NEEDS-ACTION` is now set for new invites, if no `PARTSTAT` is
+   set to support the inbox feature of iOS.
+ * #147: Bugs related to scheduling all-day events.
+ 
++
  3.3.2 (2014-09-19)
  ------------------
  

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