loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' of https://github.com/devcode-it/openstamanager

This commit is contained in:
MatteoPistorello 2022-11-28 14:50:23 +01:00
parent 9b04b5a05b 8d23e05d14
commit d752823674
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gulpfile.js
View File

@ -124,7 +124,9 @@ const JS = gulp.parallel(() => {
vendor[i] = config.nodeDirectory + '/' + vendor[i]; vendor[i] = config.nodeDirectory + '/' + vendor[i];
} }
return gulp.src(vendor) return gulp.src(vendor, {
allowEmpty: true
})
.pipe(babel(config.babelOptions)) .pipe(babel(config.babelOptions))
.pipe(concat('app.min.js')) .pipe(concat('app.min.js'))
.pipe(gulpIf(!config.debug, minifyJS())) .pipe(gulpIf(!config.debug, minifyJS()))
@ -181,7 +183,9 @@ const CSS = gulp.parallel(() => {
vendor[i] = config.nodeDirectory + '/' + vendor[i]; vendor[i] = config.nodeDirectory + '/' + vendor[i];
} }
return gulp.src(vendor) return gulp.src(vendor, {
allowEmpty: true
})
.pipe(gulpIf('*.scss', sass(), gulpIf('*.less', less(), gulpIf('*.styl', stylus())))) .pipe(gulpIf('*.scss', sass(), gulpIf('*.less', less(), gulpIf('*.styl', stylus()))))
.pipe(autoprefixer()) .pipe(autoprefixer())
.pipe(minifyCSS({ .pipe(minifyCSS({

42
include/init/configuration.php
View File

@ -181,26 +181,26 @@ if (post('db_host') !== null) {
else { else {
// Creazione manifest.json // Creazione manifest.json
$manifest = '{ $manifest = '{
"dir" : "ltr", "dir" : "ltr",
"lang" : "it-IT", "lang" : "'.((empty($lang) || $lang == '|lang|') ? 'it-IT' : str_replace('_','-',$lang)).'",
"name" : "OpenSTAManager", "name" : "'.tr('OpenSTAManager').'",
"scope" : "'.base_path().'", "scope" : "'.((empty(base_path()) || base_path()=='/') ? '' : '.').'",
"display" : "fullscreen", "display" : "fullscreen",
"start_url" : "'.base_path().'", "start_url" : "'.((empty(base_path()) || base_path()=='/') ? '/' : './').'",
"short_name" : "OSM", "short_name" : "OSM",
"theme_color" : "transparent", "theme_color" : "transparent",
"description" : "OpenSTAManager", "description" : "'.tr('OpenSTAManager').'",
"orientation" : "any", "orientation" : "any",
"background_color" : "transparent", "background_color" : "transparent",
"generated" : "true", "generated" : "true",
"icons" : [ "icons" : [
{ {
"src": "assets/dist/img/logo_completo.png", "src": "assets/dist/img/logo_completo.png",
"type": "image/png", "type": "image/png",
"sizes": "489x91" "sizes": "489x91"
} }
] ]
}'; }';
file_put_contents('manifest.json', $manifest); file_put_contents('manifest.json', $manifest);
redirect(base_path().'/index.php'); redirect(base_path().'/index.php');
@ -209,6 +209,8 @@ if (post('db_host') !== null) {
} }
} }
// Controlla che i parametri di configurazione permettano l'accesso al database // Controlla che i parametri di configurazione permettano l'accesso al database
if ((file_exists('config.inc.php') || $valid_config) && !$dbo->isConnected()) { if ((file_exists('config.inc.php') || $valid_config) && !$dbo->isConnected()) {
echo ' echo '

2
package.json
View File

@ -20,7 +20,7 @@
"dropzone": "^5.7.2", "dropzone": "^5.7.2",
"eonasdan-bootstrap-datetimepicker": "^4.17.49", "eonasdan-bootstrap-datetimepicker": "^4.17.49",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"fullcalendar": "^3.10.4", "fullcalendar": "^3.10.5",
"geocomplete": "^1.7.0", "geocomplete": "^1.7.0",
"hotkeys-js": "^3.8.5", "hotkeys-js": "^3.8.5",
"html5sortable": "^0.13.2", "html5sortable": "^0.13.2",