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

Merge branch 'seeddms-4.2.1' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-22 21:10:19 +02:00
commit 588254a7ce
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 4.2.1
--------------------------------------------------------------------------------
- fixing jumploader upload, added missing file for uploading attachments
--------------------------------------------------------------------------------
Changes in version 4.2.0
--------------------------------------------------------------------------------

1
languages/de_DE/lang.inc
View File

@ -136,6 +136,7 @@ $text = array(
'choose_workflow' => "Workflow wählen",
'choose_workflow_state' => "Workflow-Status wählen",
'choose_workflow_action' => "Workflow-Aktion wählen",
'clipboard' => "Zwischenablage",
'close' => "Schließen",
'comment' => "Kommentar",
'comment_for_current_version' => "Kommentar zur aktuellen Version",

1
languages/en_GB/lang.inc
View File

@ -136,6 +136,7 @@ $text = array(
'choose_workflow' => "Choose workflow",
'choose_workflow_state' => "Choose workflow state",
'choose_workflow_action' => "Choose workflow action",
'clipboard' => "Clipboard",
'close' => "Close",
'comment' => "Comment",
'comment_for_current_version' => "Version comment",

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

@ -1042,7 +1042,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
function printClipboard($clipboard){ /* {{{ */
$dms = $this->params['dms'];
$this->contentHeading("Clipboard", true);
$this->contentHeading(getMLText("clipboard"), true);
echo "<div class=\"well\" ondragover=\"allowDrop(event)\" ondrop=\"onAddClipboard(event)\">\n";
$clipboard = $this->params['session']->getClipboard();
// print_r($clipboard);