[Pkg-owncloud-commits] [php-sabredav] 07/66: Merge branch '1.7' into 1.8

[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-sabredav.

commit aa4dea6769fb727f8d92d19927a02f417f4d9008
Merge: 41c750d 977f8af
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Nov 8 21:02:35 2013 -0500

    Merge branch '1.7' into 1.8
    
    Conflicts:
    	ChangeLog
    	lib/Sabre/DAV/URLUtil.php
    	lib/Sabre/DAV/Version.php

 ChangeLog                       | 3 +++
 lib/Sabre/DAV/URLUtil.php       | 7 +++++--
 tests/Sabre/DAV/URLUtilTest.php | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --cc ChangeLog
index 145cf1f,2928888..0134ece
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,54 -1,6 +1,57 @@@
 +1.8.7-stable (2013-10-02)
 +	* The zip release ships with sabre/vobject 2.1.3.
 +	* Includes changes from version 1.7.9.
 +
 +1.8.6-stable (2013-06-18)
 +	* The zip release ships with sabre/vobject 2.1.0.
 +	* Includes changes from version 1.7.8.
 +
 +1.8.5-stable (2013-04-11)
 +	* The zip release ships with sabre/vobject 2.0.7.
 +	* Includes changes from version 1.7.7.
 +
 +1.8.4-stable (2013-04-08)
 +	* The zip release ships with sabre/vobject 2.0.7.
 +	* Includes changes from version 1.7.6.
 +
 +1.8.3-stable (2013-03-01)
 +	* The zip release ships with sabre/vobject 2.0.6.
 +	* Includes changes from version 1.7.5.
 +	* Fixed: organizer email-address for shared calendars is now prefixed with
 +	  mailto:, as it should.
 +
 +1.8.2-stable (2013-01-19)
 +	* The zip release ships with sabre/vobject 2.0.5.
 +	* Includes changes from version 1.7.4.
 +
 +1.8.1-stable (2012-12-01)
 +	* The zip release ships with sabre/vobject 2.0.5.
 +	* Includes changes from version 1.7.3.
 +	* Fixed: Typo in 1.7 migration script caused it to fail.
 +
 +1.8.0-stable (2012-11-08)
 +	* The zip release ships with sabre/vobject 2.0.5.
 +	* BC Break: Moved the entire codebase to PHP namespaces.
 +	* BC Break: Every backend package (CalDAV, CardDAV, Auth, Locks,
 +	  Principals) now has consistent naming conventions. There's a
 +	  BackendInterface, and an AbstractBackend class.
 +	* BC Break: Changed a bunch of constructor signatures in the CalDAV
 +	  package, to reduce dependencies on the ACL package.
 +	* BC Break: Sabre_CalDAV_ISharedCalendar now also has a getShares method,
 +	  so sharees can figure out who is also on a shared calendar.
 +
 +	* Added: Sabre_DAVACL_IPrincipalCollection interface, to advertise support
 +	  for principal-property-search on any node.
 +	* Added: Simple console script to fire up a fileserver in the current
 +	  directory using PHP 5.4's built-in webserver.
 +	* Added: Sharee's can now also read out the list of invites for a shared
 +	  calendar.
 +	* Added: The Proxy principal classes now both implement an interface, for
 +	  greater flexiblity.
 +
+ 1.7.10-stable (2013-??-??)
+ 	* Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
+ 
  1.7.9-stable (2013-10-02)
  	* The zip release ships with sabre/vobject 2.1.3.
  	* Fixed: Issue #365. Incorrect output when principal urls have spaces in
diff --cc lib/Sabre/DAV/URLUtil.php
index b71ea00,4d9bfb6..3b9e579
--- a/lib/Sabre/DAV/URLUtil.php
+++ b/lib/Sabre/DAV/URLUtil.php
@@@ -14,6 -12,11 +14,9 @@@ namespace Sabre\DAV
   * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
   * kept as-is.
   *
+  * It was also discovered that versions of the SOGO connector for thunderbird
+  * has issues with urlencoded colons.
+  *
 - * @package Sabre
 - * @subpackage DAV
   * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
   * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License

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