From 947a4d83f8d175c79a1a920d8966e96531f3a131 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 30 Apr 2013 19:38:48 +0200 Subject: [PATCH 1/3] put icons in clipboard into div to make them black --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1e56d72b7..8b7484ea8 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1102,7 +1102,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { } print "\n"; print "\n"; - print "params['folder']->getID()."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\">"; + print "
params['folder']->getID()."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\">
"; print "\n"; print ""; } From 031751bd2f6c74c62ad9059bb53a01bf6850ec40 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 30 Apr 2013 19:39:41 +0200 Subject: [PATCH 2/3] more entries for 4.3.0 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 685db0bdb..c8455c5d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - expiration date cannot be set for the version as indicated by the gui. I was always set for the document, but this was not clear from the gui. +- reorganization of ViewDocument page -------------------------------------------------------------------------------- Changes in version 4.2.1 From 14e8d4ef021fce5167fbb53a09a7b75783294fee Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 30 Apr 2013 20:00:50 +0200 Subject: [PATCH 3/3] set max execution time from settings --- inc/inc.Settings.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php index f53def579..34bbf1fae 100644 --- a/inc/inc.Settings.php +++ b/inc/inc.Settings.php @@ -70,4 +70,7 @@ if (isset($settingsOLD)) { if(isset($settings->_extraPath)) ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path')); +if(isset($settings->_maxExecutionTime)) + ini_set('max_execution_time', $settings->_maxExecutionTime); + ?>