Merge branch 'floorplan-vdr' of https://github.com/tarag/openhab-webui …

…into floorplan-vdr
openhab · Sep 23, 2021 · b7279e5 · b7279e5
2 parents a62b0a8 + 784713b
commit b7279e5
Show file tree

Hide file tree

Showing 51 changed files with 24,932 additions and 1,811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ target/
 src-gen/
 bin/
 .metadata/
+.openapi-generator/
 **/.settings/org.eclipse.*
 features/*/src/main/history
 npm-debug.log

diff --git a/bundles/org.openhab.ui.basic/gulpfile.js b/bundles/org.openhab.ui.basic/gulpfile.js
@@ -48,5 +48,5 @@
 			.pipe(gulp.dest("./src/main/resources/web"));
 	});
 
-	gulp.task("default", [ "css", "copyFontLibs", "eslint", "js" ]);
+	gulp.task("default", gulp.parallel("css", "copyFontLibs", gulp.series("eslint", "js")));
 })();
diff --git a/bundles/org.openhab.ui.basic/npm-shrinkwrap.json b/bundles/org.openhab.ui.basic/npm-shrinkwrap.json