[Pkg-owncloud-commits] [php-sabre-vobject] 23/43: Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3
David Prévot
taffit at moszumanska.debian.org
Sat Jan 10 14:20:15 UTC 2015
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 d563f55a087da6a2db10a91c235b88d7c99c6f2e
Merge: 684ae8a 3b188e2
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Mon Jan 5 20:38:26 2015 -0500
Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3
ChangeLog.md | 23 ++++++++++++++++------
LICENSE | 2 +-
lib/Cli.php | 2 +-
lib/Component.php | 2 +-
lib/Component/VAlarm.php | 2 +-
lib/Component/VCalendar.php | 16 +++++++++++++--
lib/Component/VCard.php | 11 ++++++++++-
lib/Component/VEvent.php | 2 +-
lib/Component/VFreeBusy.php | 2 +-
lib/Component/VJournal.php | 2 +-
lib/Component/VTimeZone.php | 2 +-
lib/Component/VTodo.php | 2 +-
lib/DateTimeParser.php | 2 +-
lib/Document.php | 2 +-
lib/ElementList.php | 2 +-
lib/EofException.php | 2 +-
lib/FreeBusyGenerator.php | 2 +-
lib/ITip/Broker.php | 2 +-
lib/ITip/ITipException.php | 2 +-
lib/ITip/Message.php | 2 +-
.../SameOrganizerForAllComponentsException.php | 2 +-
lib/Node.php | 2 +-
lib/Parameter.php | 2 +-
lib/ParseException.php | 2 +-
lib/Parser/Json.php | 2 +-
lib/Parser/MimeDir.php | 2 +-
lib/Parser/Parser.php | 2 +-
lib/Property.php | 2 +-
lib/Property/Binary.php | 2 +-
lib/Property/Boolean.php | 2 +-
lib/Property/FlatText.php | 2 +-
lib/Property/Float.php | 2 +-
lib/Property/ICalendar/CalAddress.php | 2 +-
lib/Property/ICalendar/Date.php | 2 +-
lib/Property/ICalendar/DateTime.php | 3 +--
lib/Property/ICalendar/Duration.php | 2 +-
lib/Property/ICalendar/Period.php | 2 +-
lib/Property/ICalendar/Recur.php | 2 +-
lib/Property/Integer.php | 2 +-
lib/Property/Text.php | 2 +-
lib/Property/Time.php | 2 +-
lib/Property/Unknown.php | 2 +-
lib/Property/Uri.php | 2 +-
lib/Property/UtcOffset.php | 2 +-
lib/Property/VCard/Date.php | 2 +-
lib/Property/VCard/DateAndOrTime.php | 2 +-
lib/Property/VCard/DateTime.php | 2 +-
lib/Property/VCard/LanguageTag.php | 2 +-
lib/Property/VCard/TimeStamp.php | 2 +-
lib/Reader.php | 2 +-
lib/Recur/EventIterator.php | 14 +------------
lib/Recur/NoInstancesException.php | 2 +-
lib/Recur/RDateIterator.php | 2 +-
lib/Recur/RRuleIterator.php | 2 +-
lib/RecurrenceIterator.php | 2 +-
lib/Splitter/ICalendar.php | 2 +-
lib/Splitter/SplitterInterface.php | 2 +-
lib/Splitter/VCard.php | 2 +-
lib/StringUtil.php | 2 +-
lib/TimeZoneUtil.php | 2 +-
lib/UUIDUtil.php | 2 +-
lib/VCardConverter.php | 8 +++-----
lib/Version.php | 4 ++--
lib/timezonedata/exchangezones.php | 2 +-
lib/timezonedata/lotuszones.php | 2 +-
lib/timezonedata/php-bc.php | 4 ++--
lib/timezonedata/php-workaround.php | 2 +-
lib/timezonedata/windowszones.php | 4 ++--
tests/VObject/CliTest.php | 3 +--
tests/VObject/Component/VCalendarTest.php | 22 +++++++++++++++++++++
tests/VObject/ITip/BrokerTester.php | 2 +-
71 files changed, 135 insertions(+), 97 deletions(-)
diff --cc lib/Parser/MimeDir.php
index 3a87f7b,cab4ee3..e90832f
--- a/lib/Parser/MimeDir.php
+++ b/lib/Parser/MimeDir.php
@@@ -13,13 -13,11 +13,13 @@@ us
/**
* MimeDir parser.
*
- * This class parses iCalendar/vCard files and returns an array.
+ * This class parses iCalendar 2.0 and vCard 2.1, 3.0 and 4.0 files. This
+ * parser will return one of the following two objects from the parse method:
*
- * The array is identical to the format jCard/jCal use.
+ * Sabre\VObject\Component\VCalendar
+ * Sabre\VObject\Component\VCard
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list