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

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-05-12 18:46:25 +02:00
commit 98e7615c5b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -39,6 +39,7 @@
- add list of currently logged in users in menu - add list of currently logged in users in menu
- the owner of a document can see even none public attachments - the owner of a document can see even none public attachments
- uploading multiple files can be turned off - uploading multiple files can be turned off
- add list of tasks in menu
- merged changes from 5.0.12 - merged changes from 5.0.12
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
SeedDMS_Core/package.xml
View File

@ -1427,6 +1427,8 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public - SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
if the owner tries to access them if the owner tries to access them
- Check return value of onPreRemove[Document|Folder], return from calling method if bool - Check return value of onPreRemove[Document|Folder], return from calling method if bool
- Add SeedDMS_Core_DMS::getDocumentList()
- Limit number of duplicate files to 1000
</notes> </notes>
</release> </release>
<release> <release>

3
views/bootstrap/class.Settings.php
View File

@ -902,9 +902,12 @@ if(!is_writeable($settings->_configFilePath)) {
} }
break; break;
default: default:
$this->showTextField("extensions[".$extname."][".$confkey."]", isset($settings->_extensions[$extname][$confkey]) ? $settings->_extensions[$extname][$confkey] : '', '', '');
/*
?> ?>
<input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" <?php echo isset($conf['size']) ? 'size="'.$conf['size'].'"' : ""; ?>" /> <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" <?php echo isset($conf['size']) ? 'size="'.$conf['size'].'"' : ""; ?>" />
<?php <?php
*/
} }
?> ?>
</td></tr> </td></tr>