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

Merge branch 'seeddms-4.3.8' into develop

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Uwe Steinmann 2014-04-09 09:55:38 +02:00
commit 71fb0326e1
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -13,6 +13,7 @@
- add missing error msg in attribute editor (Bug #149) - add missing error msg in attribute editor (Bug #149)
- better user feedback after reseting password (Bug #139) - better user feedback after reseting password (Bug #139)
- add page with statistical data (pie charts) - add page with statistical data (pie charts)
- add mode for showing missing translations (turned off by default)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.7 Changes in version 4.3.7

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION=4.3.7 VERSION=4.3.8
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 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 # 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.7'; $this->version = '4.3.8';
} /* }}} */ } /* }}} */
function getDB() { /* {{{ */ function getDB() { /* {{{ */

2
SeedDMS_Core/package.xml
View File

@ -12,7 +12,7 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2014-04-01</date> <date>2014-04-09</date>
<time>09:03:59</time> <time>09:03:59</time>
<version> <version>
<release>4.3.8</release> <release>4.3.8</release>

2
inc/inc.Version.php
View File

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

3
install/settings.xml.template_install
View File

@ -181,12 +181,13 @@
<!-- siteDefaultPage: Default page on login. Defaults to out/out.ViewFolder.php <!-- siteDefaultPage: Default page on login. Defaults to out/out.ViewFolder.php
- rootFolderID: ID of root-folder (mostly no need to change) - rootFolderID: ID of root-folder (mostly no need to change)
- titleDisplayHack: Workaround for page titles that go over more than 2 lines. - titleDisplayHack: Workaround for page titles that go over more than 2 lines.
- showMissingTranslations: Check for missing translations and adds forms at the end of the page for submitting new translations.
--> -->
<display <display
siteDefaultPage ="" siteDefaultPage =""
rootFolderID = "1" rootFolderID = "1"
titleDisplayHack = "true" titleDisplayHack = "true"
showMissingTranslations = "false"
> >
</display> </display>
<!-- guestID: ID of guest-user used when logged in as guest (mostly no need to change) <!-- guestID: ID of guest-user used when logged in as guest (mostly no need to change)