gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-05 07:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.1.3' into develop

Browse Source 
Conflicts:
	Makefile
	inc/inc.Version.php
This commit is contained in:
Uwe Steinmann 2013-04-08 16:50:12 +02:00
commit 6277eb2f6c
3 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

24
SeedDMS_Core/package.xml
View File

@ -12,10 +12,10 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2013-04-05</date>
<time>16:08:38</time>
<date>2013-04-08</date>
<time>16:45:06</time>
<version>
<release>4.1.2</release>
<release>4.1.3</release>
<api>4.1.0</api>
</version>
<stability>
@ -24,7 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- set propper folderList of sub folders after moving a folder
- stay in sync with seeddms application
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -465,5 +465,21 @@ New release
- stay in sync with seeddms application
</notes>
</release>
<release>
<date>2013-04-05</date>
<time>16:08:38</time>
<version>
<release>4.1.2</release>
<api>4.1.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- set propper folderList of sub folders after moving a folder
</notes>
</release>
</changelog>
</package>

37
inc/inc.Version.php
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<?php
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
@ -32,3 +33,39 @@ class SeedDMS_Version {
}
}
?>
=======
<?php
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010-2013 Uwe Steinmann
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
class SeedDMS_Version {
var $_number = "4.1.3";
var $_string = "SeedDMS";
function SeedDMS_Version() {
return;
}
function banner() {
return $this->_string .", ". $this->_number;
}
}
?>
>>>>>>> seeddms-4.1.3