[Pkg-owncloud-commits] [php-sabre-vobject] 14/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 470bc47a76958204865d6e794fcb1f9f97d94232
Merge: 0dd7ae5 b8ed50b
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sat Oct 4 22:51:10 2014 +0100

    Merge branch '3.3'
    
    Conflicts:
    	.travis.yml

 .travis.yml                                        |   2 -
 ChangeLog.md                                       |   5 +
 bin/fetch_windows_zones.php                        |   2 +-
 lib/ITip/Broker.php                                |   5 +
 lib/Parameter.php                                  |  14 +-
 lib/TimeZoneUtil.php                               |  37 ++++-
 lib/timezonedata/php-bc.php                        | 153 +++++++++++++++++++++
 .../{php-compat.php => php-workaround.php}         |   9 +-
 lib/timezonedata/windowszones.php                  |   5 +-
 tests/VObject/EmptyParameterTest.php               |  69 ++++++++++
 tests/VObject/ITip/BrokerNewEventTest.php          |  16 +++
 tests/VObject/ITip/BrokerUpdateEventTest.php       |  58 ++++++++
 tests/VObject/Issue154Test.php                     |  29 ----
 tests/VObject/ParameterTest.php                    |   2 +-
 tests/VObject/TimeZoneUtilTest.php                 |  56 +++++++-
 15 files changed, 414 insertions(+), 48 deletions(-)

diff --cc .travis.yml
index 4f45448,ed7095d..2619b1f
--- a/.travis.yml
+++ b/.travis.yml
@@@ -6,10 -8,6 +6,8 @@@ php
  
  matrix:
    fast_finish: true
 +  allow_failures:
 +    - php: hhvm
-     - php: hhvm-nightly
  
  script:
    - phpunit --configuration tests/phpunit.xml
diff --cc ChangeLog.md
index 9695e51,b0e60c0..2120740
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -21,8 -10,12 +21,13 @@@ ChangeLo
  * #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.
+ * #148: Ignore events that have attendees but no organizer.
+ * #149: Avoiding logging errors during timezone detection. This is a workaround
+   for a PHP bug.
+ * Support for "Line Islands Standard Time" windows timezone.
+ * #154: Correctly work around vCard parameters that have a value but no name.
  
 +
  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