From 5bca4770d1421249d0f7cb10d6c7b1d2eb063372 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 28 Feb 2017 07:09:30 +0100 Subject: [PATCH] start new version 5.0.11 --- CHANGELOG | 4 ++++ Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 25 ++++++++++++++++++++----- inc/inc.Version.php | 2 +- install/install.php | 2 +- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 96e34b570..f3a63312d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +-------------------------------------------------------------------------------- + Changes in version 5.0.11 +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Changes in version 5.0.10 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 3cb42ba1e..7e1061a85 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=5.0.10 +VERSION=5.0.11 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 9c51be665..932b0655b 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.10'; + $this->version = '5.0.11'; } /* }}} */ /** diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index ebff746a9..afe792ef2 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2017-02-20 - + 2017-02-28 + - 5.0.10 - 5.0.10 + 5.0.11 + 5.0.11 stable @@ -24,7 +24,6 @@ GPL License -- all changes from 4.3.33 merged @@ -1312,5 +1311,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated - all changes from 4.3.32 merged + + 2017-02-20 + + + 5.0.10 + 5.0.10 + + + stable + stable + + GPL License + +- all changes from 4.3.33 merged + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index a903ac52d..80b24a536 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "5.0.10"; + public $_number = "5.0.11"; private $_string = "SeedDMS"; function __construct() { diff --git a/install/install.php b/install/install.php index 726cdd341..b22aad8a0 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.10"); +define("SEEDDMS_VERSION", "5.0.11"); require_once('../inc/inc.ClassSettings.php');