gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 07:22:11 +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 2024-10-28 13:02:04 +01:00
commit 32b6445904
12 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gruntfile.js
View File

@ -206,6 +206,14 @@ module.exports = function (grunt) {
],
dest: bootstrapDir + '/spectrum-colorpicker2',
flatten: true
},{
expand: true,
src: [
nodeDir + '/jquery-lazy/jquery.lazy.min.js',
nodeDir + '/jquery-lazy/jquery.lazy.plugins.js'
],
dest: bootstrapDir + '/jquery-lazy',
flatten: true
},{
expand: true,
src: [

1
out/out.Help.php
View File

@ -36,6 +36,7 @@ if(isset($_GET['context']))
$context = $_GET['context'];
else
$context = '';
if ($view) {
$view->setParam('dms', $dms);
$view->setParam('user', $user);

2
out/out.LogManagement.php
View File

@ -36,7 +36,7 @@ if (!$accessop->check_view_access($view, $_GET)) {
}
if (isset($_GET["logname"])) $logname=basename($_GET["logname"], '.log').'.log';
else $logname=NULL;
else $logname=null;
if (isset($_GET["mode"])) $mode=$_GET["mode"];
else $mode='default';

1
package.json
View File

@ -27,6 +27,7 @@
"grunt-contrib-copy": "^1.0.0",
"jqtree": "^1.5.1",
"jquery": "^3.7.1",
"jquery-lazy": "^1.7.11",
"jquery-typeahead": "^2.11.1",
"jquery-validation": "^1.19.2",
"moment": "^2.29.1",