Permalink
Browse files

Merge branch '1.8'

Conflicts:
	.travis.yml
	ChangeLog
	build.xml
	lib/Sabre/DAV/Client.php
	lib/Sabre/HTTP/Version.php
  • Loading branch information...
2 parents 3b1a484 + f8bad17 commit 24b7421bfc5e05c551198eeae46b82f80227aa10 @evert evert committed Feb 9, 2014
Showing with 7 additions and 10 deletions.
  1. +2 −0 .travis.yml
  2. +5 −3 ChangeLog.md
  3. +0 −7 build.xml
View
@@ -2,10 +2,12 @@ language: php
php:
- 5.4
- 5.5
+ - 5.6
- hhvm
matrix:
allow_failures:
+ - php: 5.6
- php: hhvm
services:
View
@@ -85,11 +85,12 @@ ChangeLog
for calendar objects, if the caldav backend provides this info.
-1.8.8 (2013-??-??)
+1.8.8 (2014-02-09)
------------------
* includes changes from version 1.7.10.
-
+* The zip release ships with sabre/vobject 2.1.3.
+* includes changes from version 1.7.10.
1.8.7 (2013-10-02)
------------------
@@ -165,10 +166,11 @@ ChangeLog
greater flexiblity.
-1.7.10 (2014-??-??)
+1.7.10 (2014-02-09)
-------------------
* Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
+* Fixed: Potential security vulnerability in the http client.
1.7.9 (2013-10-02)
View
@@ -16,13 +16,6 @@
<zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />
</target>
- <target name="uploadzip" depends="buildzip">
- <echo>Uploading to Google Code</echo>
- <propertyprompt propertyName="googlecode.username" promptText="Enter your googlecode username" useExistingValue="true" />
- <propertyprompt propertyName="googlecode.password" promptText="Enter your googlecode password" useExistingValue="true" />
- <exec command="bin/googlecode_upload.py -s 'SabreDAV ${sabredav.version}' -p sabredav -u '${googlecode.username}' -w '${googlecode.password}' build/SabreDAV-${sabredav.version}.zip" checkreturn="true" />
- </target>
-
<target name="clean" depends="init">
<echo msg="Removing build files (cleaning up distribution)" />
<delete dir="docs/api" />

0 comments on commit 24b7421

Please sign in to comment.