gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +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 2021-11-28 08:44:06 +01:00
commit 622b7a13bb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gruntfile.js
View File

@ -1,7 +1,10 @@
module.exports = function (grunt) { module.exports = function (grunt) {
'use strict'; 'use strict';
var bootstrapDir = 'views/bootstrap/vendors', // if you set bootstrapDir to views/bootstrap/vendors then make sure
// bootbox is not installed, because version 5 of bootbox will not work
// with bootstrap 2
var bootstrapDir = 'views/bootstrap4/vendors',
tdkDir = 'views/tdk/vendors', tdkDir = 'views/tdk/vendors',
nodeDir = 'node_modules'; nodeDir = 'node_modules';
@ -113,6 +116,13 @@ module.exports = function (grunt) {
], ],
dest: bootstrapDir + '/jquery-typeahead', dest: bootstrapDir + '/jquery-typeahead',
flatten: true flatten: true
},{
expand: true,
src: [
nodeDir + '/bootbox/dist/*'
],
dest: bootstrapDir + '/bootbox',
flatten: true
},{ },{
expand: true, expand: true,
src: [ src: [

1
package.json
View File

@ -11,6 +11,7 @@
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.3.0", "@coreui/coreui": "^3.3.0",
"@ttskch/select2-bootstrap4-theme": "^1.5.2", "@ttskch/select2-bootstrap4-theme": "^1.5.2",
"bootbox": "^5.5.2",
"bootstrap": "^4.5.2", "bootstrap": "^4.5.2",
"bootstrap-datepicker": "^1.9.0", "bootstrap-datepicker": "^1.9.0",
"chartjs": "^0.3.24", "chartjs": "^0.3.24",