new version 6.0.2

CHANGELOG

@@ -1,13 +1,10 @@
 --------------------------------------------------------------------------------
-                     Changes in version 6.0.1
+                     Changes in version 6.0.2
 --------------------------------------------------------------------------------
 - check if user has access on document and is not disabled if set as
   receiver, revisor
 - check if group has members if set as reviewer, approver, receiver, revisor
 - fix bug in notification of approver after successful review
-- call hook 'rawcontent' when downloading transmittal list or search content
-- speed up list of locked documents on MyDocuments page
-- sql queries and execution times can be written to file in database layer
 - add document check for docs in revision and missing access rights of revisor
 - add document check for docs requiring receptions but user lacks access right
 - fix Acl manager when using pgsql
@@ -17,6 +14,14 @@
 - downloading of review/approval files works again
 - optimizing retrieval of open tasks
 - do not show user which has been removed from a process except for admins
+- merge changes up to 5.1.5
+
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.1
+--------------------------------------------------------------------------------
+- call hook 'rawcontent' when downloading transmittal list or search content
+- speed up list of locked documents on MyDocuments page
+- sql queries and execution times can be written to file in database layer
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

Makefile

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

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-11-07</date>
+ <date>2017-12-18</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.1</release>
+  <release>6.0.2</release>
-  <api>6.0.1</api>
+  <api>6.0.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -34,7 +34,7 @@ are any waiting or pending revisions at all
 - 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.4 merged
+- all changes up to 5.1.5 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1595,5 +1595,22 @@ log entry first
 - add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
+  <release>
+   <date>2017-05-28</date>
+   <time>06:34:50</time>
+   <version>
+    <release>6.0.1</release>
+    <api>6.0.1</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
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.1";
+	public $_number = "6.0.2";
 	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.1");
+define("SEEDDMS_VERSION", "6.0.2");
 
 require_once('../inc/inc.ClassSettings.php');