Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.3
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.2
 --------------------------------------------------------------------------------
@@ -48,6 +52,10 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.6
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5
 --------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-VERSION=6.0.2
+VERSION=6.0.3
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -444,7 +444,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.1';
+			$this->version = '6.0.3';
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-12-19</date>
+ <date>2018-01-09</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.2</release>
+  <release>6.0.3</release>
-  <api>6.0.2</api>
+  <api>6.0.3</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,18 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- speed up getting list of locked documents
-- setting _logfile in inc.DBAccessPDO.php will log execution times in file
-- fix sql statement to create temp table ttrevisionid and ttreceiptid
-- SeedDMS_Core_DMS::noReadForStatus no longer needed
-- SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
-are any waiting or pending revisions at all
-- SeedDMS_Core_User::getReverseSubstitutes() works with new roles
-- fix field name in getDocumentList() to make it work for pgsql
-- views instead of temp. tables can be used
-- ReceiveOwner list does not contain old versions anymore
-- all changes up to 5.1.5 merged
-- getTimeline() also returns data for documents with a scheduled revision
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1619,5 +1607,32 @@ log entry first
 - setting _logfile in inc.DBAccessPDO.php will log execution times in file
    </notes>
   </release>
+  <release>
+   <date>2017-12-19</date>
+   <time>09:19:24</time>
+   <version>
+    <release>6.0.2</release>
+    <api>6.0.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
+- fix sql statement to create temp table ttrevisionid and ttreceiptid
+- SeedDMS_Core_DMS::noReadForStatus no longer needed
+- SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
+are any waiting or pending revisions at all
+- SeedDMS_Core_User::getReverseSubstitutes() works with new roles
+- fix field name in getDocumentList() to make it work for pgsql
+- views instead of temp. tables can be used
+- ReceiveOwner list does not contain old versions anymore
+- all changes up to 5.1.5 merged
+- getTimeline() also returns data for documents with a scheduled revision
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.2";
+	public $_number = "6.0.3";
 	private $_string = "SeedDMS";
 
 	function __construct() {

install/install.php

@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.2");
+define("SEEDDMS_VERSION", "6.0.3");
 
 require_once('../inc/inc.ClassSettings.php');