[Pkg-owncloud-commits] [php-sabredav] 01/01: 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 tag 1.8.8
in repository php-sabredav.

commit f8bad179521f434c60d836c8203f791b37a30657
Merge: 10dd6f9 44f3707
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sun Feb 9 16:25:45 2014 -0500

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

 .travis.yml                | 7 +++++++
 ChangeLog                  | 7 +++++--
 build.xml                  | 7 -------
 lib/Sabre/DAV/Client.php   | 6 +++++-
 lib/Sabre/HTTP/Version.php | 2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --cc ChangeLog
index 57c9296,3b63166..c5bcd34
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,58 -1,6 +1,61 @@@
- 1.8.8-stable (2013-??-??)
++1.8.8-stable (2013-02-09)
++	* The zip release ships with sabre/vobject 2.1.3.
 +	* includes changes from version 1.7.10.
 +
 +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 (2014-??-??)
+ 1.7.10-stable (2014-02-09)
+ 	* The zip release ships with sabre/vobject 2.1.3.
+ 	* Fixed: Potential security vulnerability in the http client.
  	* Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
  
  1.7.9-stable (2013-10-02)
diff --cc lib/Sabre/HTTP/Version.php
index 85ef8fc,4fc8c64..f93e82d
--- a/lib/Sabre/HTTP/Version.php
+++ b/lib/Sabre/HTTP/Version.php
@@@ -14,7 -14,7 +14,7 @@@ class Version 
      /**
       * Full version number
       */
-     const VERSION = '1.8.1';
 -    const VERSION = '1.7.10';
++    const VERSION = '1.8.8';
  
      /**
       * Stability : alpha, beta, stable

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