diff --git a/CHANGELOG b/CHANGELOG index 5aedcae40..b4a314aca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.0.14 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.0.13 -------------------------------------------------------------------------------- @@ -97,6 +101,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 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index da89628fe..5b116ce09 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=5.0.13 +VERSION=5.0.14 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer # webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index f1e83cc18..6b5fd9efc 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -344,7 +344,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '5.0.13'; + $this->version = '5.0.14'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index c298f166b..79da8d700 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2017-08-29 + 2017-09-05 - 5.0.13 - 5.0.13 + 5.0.14 + 5.0.14 stable @@ -24,7 +24,7 @@ GPL License -- all changes from 4.3.36 merged +- all changes from 4.3.37 merged @@ -1214,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) + + 2017-09-05 + + + 4.3.37 + 4.3.37 + + + stable + stable + + GPL License + + + 2016-01-22 diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 44b42f749..b5f14cf04 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.0.13"; + public $_number = "5.0.14"; private $_string = "SeedDMS"; function __construct() { diff --git a/install/install.php b/install/install.php index 2bf27a486..6406b3ca9 100644 --- a/install/install.php +++ b/install/install.php @@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "5.0.13"); +define("SEEDDMS_VERSION", "5.0.14"); require_once('../inc/inc.ClassSettings.php');