[Pkg-owncloud-commits] [php-sabre-vobject] 273/341: Merge branch '3.4'

[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 1aa6608f86a9eba9a985b5f93cf33f16a77515d8
Merge: b6da613 75bd5ee
Author: Evert Pot <me at evertpot.com>
Date:   Thu Jun 4 00:54:18 2015 -0400

    Merge branch '3.4'

 CHANGELOG.md                                     |  14 +++
 lib/ITip/Broker.php                              | 132 ++++++++++++-----------
 lib/Property/VCard/LanguageTag.php               |   2 +-
 tests/VObject/ITip/BrokerAttendeeReplyTest.php   |  93 ++++++++++++++++
 tests/VObject/Property/VCard/LanguageTagTest.php |  21 ++++
 5 files changed, 197 insertions(+), 65 deletions(-)

diff --cc CHANGELOG.md
index 171aae7,60501f9..bbfb53a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,25 -1,20 +1,39 @@@
  ChangeLog
  =========
  
 +4.0.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #160: Support for xCal! (@Hywan)
 +* #192: Support for xCard! (@Hywan)
 +* #186: Fixing conversion of `UTC-OFFSET` properties when going back and
 +  forward between jCal and iCalendar.
 +* Properties, Components and Parameters now implement PHP's `JsonSerializable`
 +  interface.
 +* #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.
 +* #161: Simplified `ElementList` by extending `ArrayIterator`.
 +* Removed `RecurrenceIterator` (use Recur\EventIterator instead).
 +
 +
+ 3.4.5 (2015-06-02)
+ ------------------
+ 
+ * #229: Converting vcards from 3.0 to 4.0 that contained a `LANG` property
+   would throw an error.
+ 
+ 
+ 3.4.4 (2015-05-27)
+ ------------------
+ 
+ * #228: Fixed a 'party crasher' bug in the iTip broker. This would break
+   scheduling in some cases.
+ 
+ 
  3.4.3 (2015-05-19)
  ------------------
  

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