gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 23:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.1.1' into develop

Browse Source 
Conflicts:
	Makefile
	SeedDMS_Core/package.xml
	inc/inc.Version.php
	install/install.php
This commit is contained in:
Uwe Steinmann 2013-04-05 16:57:56 +02:00
commit afaa201a96
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 4.1.1
--------------------------------------------------------------------------------
- fixed update of folders (no more php error)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.1.0 Changes in version 4.1.0
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

4
Makefile
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
VERSION=4.2.0 VERSION=4.2.0
=======
VERSION=4.1.1
>>>>>>> seeddms-4.1.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

@ -225,7 +225,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.1.0'; $this->version = '4.1.1';
} /* }}} */ } /* }}} */
function getDB() { /* {{{ */ function getDB() { /* {{{ */

8
SeedDMS_Core/package.xml
View File

@ -13,10 +13,10 @@
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2013-04-05</date> <date>2013-04-05</date>
<time>13:39:21</time> <time>16:08:38</time>
<version> <version>
<release>4.2.0</release> <release>4.1.1</release>
<api>4.2.0</api> <api>4.1.1</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</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>
- minor bugfixes - stay in sync with seeddms application
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">