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

This commit is contained in:
Uwe Steinmann 2017-09-05 09:35:23 +02:00
commit 4c5dc52fa0
6 changed files with 56 additions and 13 deletions

View File

@ -1,3 +1,7 @@
--------------------------------------------------------------------------------
Changes in version 5.1.4
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Changes in version 5.1.3
--------------------------------------------------------------------------------
@ -40,6 +44,10 @@
- added support for postgresql
- document attachments can linked to a version and be public or hidden
--------------------------------------------------------------------------------
Changes in version 5.0.14
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Changes in version 5.0.13
--------------------------------------------------------------------------------
@ -139,6 +147,10 @@
- add .xml to online file types by default
- add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.37
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Changes in version 4.3.36
--------------------------------------------------------------------------------

View File

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

View File

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

View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2017-08-29</date>
<date>2017-09-05</date>
<time>09:19:24</time>
<version>
<release>5.1.3</release>
<api>5.1.3</api>
<release>5.1.4</release>
<api>5.1.4</api>
</version>
<stability>
<release>stable</release>
@ -24,12 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- SeedDMS_Core_Document::getNotifyList() and SeedDMS_Core_Folder::getNotifyList()
returns just users which are not disabled
- add new methods removeFromProcesses(), getWorkflowsInvolved(), getKeywordCategories() to SeedDMS_Core_User
- add methods isMandatoryReviewerOf() and isMandatoryApproverOf()
- add methods transferDocumentsFolders() and transferEvents()
- add method SeedDMS_Core_DMS::getDocumentByOriginalFilename()
- all changes from 5.0.14 merged
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -1219,6 +1214,21 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
- fix sql statement for creating temp. tables (sqlite)
</notes>
</release>
<release>
<date>2017-09-05</date>
<time>06:38:12</time>
<version>
<release>4.3.37</release>
<api>4.3.37</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
</notes>
</release>
<release>
<date>2016-01-22</date>
<time>14:34:58</time>
@ -1484,5 +1494,26 @@ Add hook on(Pre|Post)RemoveContent
Add hook onAttributeValidate
</notes>
</release>
<release>
<date>2017-08-23</date>
<time>06:34:50</time>
<version>
<release>5.1.3</release>
<api>5.1.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- SeedDMS_Core_Document::getNotifyList() and SeedDMS_Core_Folder::getNotifyList()
returns just users which are not disabled
- add new methods removeFromProcesses(), getWorkflowsInvolved(), getKeywordCategories() to SeedDMS_Core_User
- add methods isMandatoryReviewerOf() and isMandatoryApproverOf()
- add methods transferDocumentsFolders() and transferEvents()
- add method SeedDMS_Core_DMS::getDocumentByOriginalFilename()
</notes>
</release>
</changelog>
</package>

View File

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

View File

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