mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-03-12 00:45:34 +00:00
Merge branch 'seeddms-4.3.8' into develop
Conflicts: Makefile
This commit is contained in:
commit
71fb0326e1
|
@ -13,6 +13,7 @@
|
|||
- add missing error msg in attribute editor (Bug #149)
|
||||
- better user feedback after reseting password (Bug #139)
|
||||
- add page with statistical data (pie charts)
|
||||
- add mode for showing missing translations (turned off by default)
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Changes in version 4.3.7
|
||||
|
|
2
Makefile
2
Makefile
|
@ -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
|
||||
# webapp
|
||||
|
||||
|
|
|
@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
|
|||
$this->convertFileTypes = array();
|
||||
$this->version = '@package_version@';
|
||||
if($this->version[0] == '@')
|
||||
$this->version = '4.3.7';
|
||||
$this->version = '4.3.8';
|
||||
} /* }}} */
|
||||
|
||||
function getDB() { /* {{{ */
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<email>uwe@steinmann.cx</email>
|
||||
<active>yes</active>
|
||||
</lead>
|
||||
<date>2014-04-01</date>
|
||||
<date>2014-04-09</date>
|
||||
<time>09:03:59</time>
|
||||
<version>
|
||||
<release>4.3.8</release>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
class SeedDMS_Version {
|
||||
|
||||
var $_number = "4.3.7";
|
||||
var $_number = "4.3.8";
|
||||
var $_string = "SeedDMS";
|
||||
|
||||
function SeedDMS_Version() {
|
||||
|
|
|
@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
|
|||
* Load default settings + set
|
||||
*/
|
||||
define("SEEDDMS_INSTALL", "on");
|
||||
define("SEEDDMS_VERSION", "4.3.7");
|
||||
define("SEEDDMS_VERSION", "4.3.8");
|
||||
|
||||
require_once('../inc/inc.ClassSettings.php');
|
||||
|
||||
|
|
|
@ -181,12 +181,13 @@
|
|||
<!-- siteDefaultPage: Default page on login. Defaults to out/out.ViewFolder.php
|
||||
- rootFolderID: ID of root-folder (mostly no need to change)
|
||||
- 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
|
||||
siteDefaultPage =""
|
||||
rootFolderID = "1"
|
||||
titleDisplayHack = "true"
|
||||
|
||||
showMissingTranslations = "false"
|
||||
>
|
||||
</display>
|
||||
<!-- guestID: ID of guest-user used when logged in as guest (mostly no need to change)
|
||||
|
|
Loading…
Reference in New Issue
Block a user