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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-09-05 09:32:03 +02:00
commit 4ba5db88e9
6 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@ -1,3 +1,7 @@
--------------------------------------------------------------------------------
Changes in version 5.0.14
--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.0.13 Changes in version 5.0.13
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -97,6 +101,10 @@
- add .xml to online file types by default - add .xml to online file types by default
- add home folder for users - add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.37
--------------------------------------------------------------------------------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.36 Changes in version 4.3.36
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
Makefile
View File

@ -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 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
# webapp # webapp

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

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

23
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2017-08-29</date> <date>2017-09-05</date>
<time>07:35:24</time> <time>07:35:24</time>
<version> <version>
<release>5.0.13</release> <release>5.0.14</release>
<api>5.0.13</api> <api>5.0.14</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -24,7 +24,7 @@
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- all changes from 4.3.36 merged - all changes from 4.3.37 merged
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
@ -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) - fix sql statement for creating temp. tables (sqlite)
</notes> </notes>
</release> </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> <release>
<date>2016-01-22</date> <date>2016-01-22</date>
<time>14:34:58</time> <time>14:34:58</time>

2
inc/inc.Version.php
View File

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

2
install/install.php
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.13"); define("SEEDDMS_VERSION", "5.0.14");
require_once('../inc/inc.ClassSettings.php'); require_once('../inc/inc.ClassSettings.php');