gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-02-02 22:51:55 +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 2025-12-18 14:15:02 +01:00
commit 616921506b
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -361,6 +361,7 @@
--------------------------------------------------------------------------------
Changes in version 5.1.45
--------------------------------------------------------------------------------
- fix rest api endpoint PUT /folder/{id}/comment
--------------------------------------------------------------------------------
Changes in version 5.1.44

4
install/install.php
View File

@ -62,7 +62,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
/**
* Load default settings + set
*/
require_once '../vendor/autoload.php';
require_once('../vendor/autoload.php');
require_once('../inc/inc.Version.php');
$ver = new SeedDMS_Version();
define("SEEDDMS_INSTALL", "on");
@ -142,7 +142,7 @@ if(isset($settings->_extraPath))
*/
$theme = "bootstrap";
include("../inc/inc.Language.php");
include "../languages/en_GB/lang.inc";
include("../languages/en_GB/lang.inc");
include("../inc/inc.ClassUI.php");
include("class.Install.php");

4
restapi/index.php
View File

@ -2755,8 +2755,8 @@ final class SeedDMS_RestapiController { /* {{{ */
$params = $request->getParsedBody();
/* Setting an empty comment is allowed. */
if ($params['comment']) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'You must supply a new name', 'data'=>''))->withStatus(400);
if (empty($params['comment'])) {
return $this->renderer->json($response, array('success'=>false, 'message'=>'You must supply a new comment', 'data'=>''))->withStatus(400);
}
$newcomment = $params['comment'];

1
views/bootstrap/styles/application.js
View File

@ -968,7 +968,6 @@ function onAddClipboard(ev) { /* {{{ */
return ret;
}
//function createStatusbar(obj) {
SeedDMSUpload.createStatusbar = function(obj) {
rowCount++;
var row="odd";

1
views/bootstrap4/styles/application.js
View File

@ -1002,7 +1002,6 @@ function onAddClipboard(ev) { /* {{{ */
return ret;
}
//function createStatusbar(obj) {
SeedDMSUpload.createStatusbar = function(obj) {
rowCount++;
var row="odd";