gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-07-27 21:10:31 +02:00
commit 6bebd3df5e
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 5.0.5
--------------------------------------------------------------------------------
- merged changes from 4.3.28
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.0.4 Changes in version 5.0.4
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -31,6 +36,11 @@
- add .xml to online file types by default - add .xml to online file types by default
- add home folder for users - add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.28
--------------------------------------------------------------------------------
- add expiration in list of documents
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.27 Changes in version 4.3.27
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

4
SeedDMS_Core/Core/inc.ClassGroup.php
View File

@ -21,7 +21,7 @@
* @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann
* @version Release: @package_version@ * @version Release: @package_version@
*/ */
class SeedDMS_Core_Group { class SeedDMS_Core_Group { /* {{{ */
/** /**
* The id of the user group * The id of the user group
* *
@ -437,5 +437,5 @@ class SeedDMS_Core_Group {
return $notifications; return $notifications;
} /* }}} */ } /* }}} */
} } /* }}} */
?> ?>

2
views/bootstrap/class.Bootstrap.php
View File

@ -1818,7 +1818,7 @@ $(document).ready( function() {
$content .= "<td>"; $content .= "<td>";
$content .= "<a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>"; $content .= "<a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b></span>"; $content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b>".($document->expires() ? ", ".getMLText('expires').": <b>".getReadableDate($document->getExpires())."</b>" : "")."</span>";
if($comment) { if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>"; $content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
} }