gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into hooks

Browse Source
This commit is contained in:
Uwe Steinmann 2013-05-02 07:36:14 +02:00
commit 1e3681094f
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -3,9 +3,11 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- create preview images for attachted document files - create preview images for attachted document files
- expiration date cannot be set for the version as indicated by the gui. - expiration date cannot be set for the version as indicated by the gui.
I was always set for the document, but this was not clear from the Even in the past it was set for the document, but this was not clear
gui. for the user.
- reorganization of ViewDocument page - reorganization of ViewDocument page
- maximum execution time of php scripts can be set in the settings
is now actually used.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.2.1 Changes in version 4.2.1

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION=4.2.0 VERSION=4.2.1
SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
#restapi webapp #restapi webapp

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

@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
$this->convertFileTypes = array(); $this->convertFileTypes = array();
$this->version = '@package_version@'; $this->version = '@package_version@';
if($this->version[0] == '@') if($this->version[0] == '@')
$this->version = '4.2.0'; $this->version = '4.2.1';
} /* }}} */ } /* }}} */
function getDB() { /* {{{ */ function getDB() { /* {{{ */

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { class SeedDMS_Version {
var $_number = "4.2.0"; var $_number = "4.2.1";
var $_string = "SeedDMS"; var $_string = "SeedDMS";
function SeedDMS_Version() { function SeedDMS_Version() {

2
install/install.php
View File

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