gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 14:37:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.3' into develop

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Uwe Steinmann 2014-02-01 16:46:34 +01:00
commit 6aa821490d
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION=4.3.2 VERSION=4.3.3
SRC=CHANGELOG inc conf utils index.php languages views op out controllers 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 controllers 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.3.2'; $this->version = '4.3.3';
} /* }}} */ } /* }}} */
function getDB() { /* {{{ */ function getDB() { /* {{{ */

6
SeedDMS_Core/package.xml
View File

@ -12,8 +12,8 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2014-01-13</date> <date>2014-02-01</date>
<time>14:29:34</time> <time>16:19:34</time>
<version> <version>
<release>4.3.3</release> <release>4.3.3</release>
<api>4.3.3</api> <api>4.3.3</api>
@ -24,6 +24,8 @@
</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>
- SeedDMS_Folder::getDocuments() and SeedDMS_Folder::getSubFolders() do not
do any sorting if $orderby is not set.
- database hostname can have port seperated by ':' - database hostname can have port seperated by ':'
- make all functions in SeedDMS_Core_File static (fixes problem with php 5.5.x) - make all functions in SeedDMS_Core_File static (fixes problem with php 5.5.x)
</notes> </notes>

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { class SeedDMS_Version {
var $_number = "4.3.2"; var $_number = "4.3.3";
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.3.2"); define("SEEDDMS_VERSION", "4.3.3");
require_once('../inc/inc.ClassSettings.php'); require_once('../inc/inc.ClassSettings.php');