[Pkg-owncloud-commits] [php-sabre-vobject] 02/65: Merge branch 'validation-upgrades' into 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 52e9ec2a5052e8453bb172d8f84cd7aab6e90ed7
Merge: 77cb636 f049232
Author: Evert Pot <me at evertpot.com>
Date:   Fri Jan 9 20:10:07 2015 -0500

    Merge branch 'validation-upgrades' into 3.3
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc ChangeLog.md
index ffaac27,7b30ff9..7e84cc7
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -11,8 -11,10 +11,12 @@@ ChangeLo
  * #175: Parser can now read and skip the UTF-8 BOM.
  * #179: Added `isFloating` to `DATE-TIME` properties.
  * #179: Fixed jCal serialization of floating `DATE-TIME` properties.
 +* #173: vCard converter failed for `X-ABDATE` properties that had no
 +  `X-ABLABEL`.
+ * #180: Added `PROFILE_CALDAV` and `PROFILE_CARDDAV` to enable validation rules
+   specific for CalDAV/CardDAV servers.
+ * #176: A missing `UID` is no longer an error, but a warning for the vCard
+   validator, unless `PROFILE_CARDDAV` is specified.
  
  
  3.3.4 (2014-11-19)

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