Merge branch 'master' into release-2.0

mstilkerich · Nov 25, 2016 · 4ace64f · 4ace64f
2 parents 744d254 + e5fa819
commit 4ace64f
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 8 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,7 +1,7 @@
 0. Log ouf of Roundcube! This is necessary for proper setup of the databases later.
 
 1a. Download the last release of RCMCardDAV here:
-  https://github.com/blind-coder/rcmcarddav/releases/tag/carddav_2.0.2
+  https://github.com/blind-coder/rcmcarddav/releases/tag/carddav_2.0.3
   Extract the archive and rename the extracted directory to 'carddav'.
 
 1b. Copy/Clone the whole RCMCardDAV plugin directory to roundcubemail/plugins/ and rename

diff --git a/carddav_common.php b/carddav_common.php
@@ -179,7 +179,7 @@ public function cdfopen($url, $http_opts, $carddav)
 		$scheme = strtolower($carddav['authentication_scheme']);
 		if ($scheme != "basic" && $scheme != "digest"){
 				/* figure out authentication */
-				$httpful->addHeader("User-Agent", "RCM CardDAV plugin/2.0.2");
+				$httpful->addHeader("User-Agent", "RCM CardDAV plugin/2.0.3");
 				$httpful->uri($url);
 				$httpful->method($http_opts['method']);
 				$error = $httpful->send();
@@ -204,7 +204,7 @@ public function cdfopen($url, $http_opts, $carddav)
 			}
 		}
 
-		$httpful->addHeader("User-Agent", "RCM CardDAV plugin/2.0.2");
+		$httpful->addHeader("User-Agent", "RCM CardDAV plugin/2.0.3");
 		$httpful->uri($url);
 
 		$httpful->method($http_opts['method']);

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "keywords": ["addressbook","carddav","contacts","owncloud","davical"],
     "homepage": "https://www.benjamin-schieder.de/carddav.html",
     "license": "GPL-2.0",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "authors": [
         {
             "name": "Benjamin Schieder",

diff --git a/composer.lock b/composer.lock
diff --git a/dbmigrations/0003-fixtimestampdefaultvalue/README.md b/dbmigrations/0003-fixtimestampdefaultvalue/README.md
@@ -0,0 +1 @@
+This migration has been disabled because it was broken. It got fixed and replaced by 0004-fixtimestampdefaultvalue.
diff --git a/dbmigrations/0003-fixtimestampdefaultvalue/mysql.sql b/dbmigrations/0003-fixtimestampdefaultvalue/mysql.sql
@@ -0,0 +1 @@
+SELECT * FROM TABLE_PREFIXcarddav_migrations; -- Just an example migration.
diff --git a/dbmigrations/0003-fixtimestampdefaultvalue/postgres.sql b/dbmigrations/0003-fixtimestampdefaultvalue/postgres.sql
@@ -0,0 +1 @@
+SELECT * FROM TABLE_PREFIXcarddav_migrations; -- No migration
diff --git a/dbmigrations/0003-fixtimestampdefaultvalue/sqlite3.sql b/dbmigrations/0003-fixtimestampdefaultvalue/sqlite3.sql
@@ -0,0 +1 @@
+SELECT * FROM TABLE_PREFIXcarddav_migrations; -- No migration
diff --git a/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql b/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql
@@ -0,0 +1 @@
+ALTER TABLE TABLE_PREFIXcarddav_addressbooks MODIFY COLUMN `last_updated` TIMESTAMP NOT NULL DEFAULT '2000-01-01 00:00:01';
diff --git a/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql b/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql
@@ -0,0 +1 @@
+SELECT * FROM TABLE_PREFIXcarddav_migrations; -- No migration
diff --git a/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql b/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql
@@ -0,0 +1 @@
+SELECT * FROM TABLE_PREFIXcarddav_migrations; -- No migration
diff --git a/package.xml b/package.xml
@@ -22,9 +22,9 @@
 		<email>[email protected]</email>
 		<active>yes</active>
 	</developer>
-	<date>2016-11-17</date>
+	<date>2016-11-25</date>
 	<version>
-		<release>2.0.2</release>
+		<release>2.0.3</release>
 	</version>
 	<stability>
 		<release>stable</release>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This migration has been disabled because it was broken. It got fixed and replaced by 0004-fixtimestampdefaultvalue.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SELECT * FROM TABLE_PREFIXcarddav_migrations; -- Just an example migration.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE TABLE_PREFIXcarddav_addressbooks MODIFY COLUMN `last_updated` TIMESTAMP NOT NULL DEFAULT '2000-01-01 00:00:01';