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

This commit is contained in:
Uwe Steinmann 2016-04-22 16:49:11 +02:00
commit 135f9c06f6
5 changed files with 5 additions and 4 deletions

View File

@ -34,6 +34,7 @@
- fix error in utils/indexer.php when new documents were indexed - fix error in utils/indexer.php when new documents were indexed
- set url in approval request email after reviewing a document (Closes #259) - set url in approval request email after reviewing a document (Closes #259)
- inform groups and users watching a new document too (Closes #260) - inform groups and users watching a new document too (Closes #260)
- use bootstrap theme for all steps in install tool
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.25 Changes in version 4.3.25

View File

@ -1,4 +1,4 @@
VERSION=5.0.2 VERSION=5.0.3
SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
# webapp # webapp

View File

@ -311,7 +311,7 @@ class SeedDMS_Core_DMS {
$this->classnames['group'] = 'SeedDMS_Core_Group'; $this->classnames['group'] = 'SeedDMS_Core_Group';
$this->version = '@package_version@'; $this->version = '@package_version@';
if($this->version[0] == '@') if($this->version[0] == '@')
$this->version = '5.0.2'; $this->version = '5.0.3';
} /* }}} */ } /* }}} */
/** /**

View File

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

View File

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