gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2022-04-25 10:19:40 +02:00
commit 24146db478
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,4 +1,5 @@
--------------------------------------------------------------------------------
<<<<<<< HEAD
Changes in version 6.0.18
--------------------------------------------------------------------------------
- finish op/op.Cron.php, returns json
@ -216,6 +217,10 @@
- add access controll list for many functions
- add document list which can be exported as an archive
- search results can be exported
=======
Changes in version 5.1.26
--------------------------------------------------------------------------------
>>>>>>> seeddms-5.1.x
--------------------------------------------------------------------------------
Changes in version 5.1.25

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -460,7 +460,7 @@ class SeedDMS_Core_DMS {
$this->lasterror = '';
$this->version = '@package_version@';
if($this->version[0] == '@')
$this->version = '6.0.18';
$this->version = '6.0.19';
} /* }}} */
/**

34
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2022-04-06</date>
<date>2022-04-25</date>
<time>13:44:55</time>
<version>
<release>6.0.18</release>
<api>6.0.18</api>
<release>6.0.19</release>
<api>6.0.19</api>
</version>
<stability>
<release>stable</release>
@ -24,13 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- rename getLastWorkflowTransition() to getLastWorkflowLog()
- getLastWorkflowLog() returns a workflow entry even if the workflow has ended
- backport setFileType() from 6.0.x
- add SeedDMS_Core_File::fileExtension()
- add callbacks on onPostUpdateAttribute, onPostRemoveAttribute, onPostAddAttribute
- fix searching for document content with a custom attribute having a value set
- SeedDMS_Core_DocumentContent::getWorkflow() has optional parameter to return data from table tblWorkflowDocumentContent
- all changes from 5.1.26
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -1958,7 +1952,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
</notes>
</release>
<release>
<date>2022-02-18</date>
<date>2022-04-22</date>
<time>13:44:55</time>
<version>
<release>5.1.25</release>
@ -2310,5 +2304,23 @@ better error checking in SeedDMS_Core_Document::cancelCheckOut()
- all changes from 5.1.24
</notes>
</release>
<release>
<date>2022-04-22</date>
<time>13:44:55</time>
<version>
<release>6.0.18</release>
<api>6.0.18</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- all changes from 5.1.25
- fix searching for document content with a custom attribute having a value set
- SeedDMS_Core_DocumentContent::getWorkflow() has optional parameter to return data from table tblWorkflowDocumentContent
</notes>
</release>
</changelog>
</package>

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { /* {{{ */
const _number = "6.0.18";
const _number = "6.0.19";
const _string = "SeedDMS";
function __construct() {