Merge remote-tracking branch 'origin/temp8' into temp8-logviewer

2018-11-28 20:18:56 +00:00
parent 9b39c6ad5b d62de961a0
commit cbc6a2ddfd
24 changed files with 467 additions and 2277 deletions
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -341,6 +341,14 @@ gulp.task('dependencies', function () {
            "src":  ["./node_modules/ng-file-upload/dist/ng-file-upload.min.js"],
            "base": "./node_modules/ng-file-upload/dist"
        },
+        {
+            "name": "nouislider",
+            "src":  [
+                "./node_modules/nouislider/distribute/nouislider.min.js",
+                "./node_modules/nouislider/distribute/nouislider.min.css"
+            ],
+            "base": "./node_modules/nouislider/distribute"
+        },
        {
            "name": "signalr",
            "src":  ["./node_modules/signalr/jquery.signalR.js"],