Merge branch 'v8/contrib' into v8/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
This commit is contained in:
Sebastiaan Janssen
2020-06-24 09:05:22 +02:00
82 changed files with 1244 additions and 454 deletions

View File

@@ -11,7 +11,7 @@
},
"dependencies": {
"ace-builds": "1.4.2",
"angular": "1.7.9",
"angular": "1.8.0",
"angular-animate": "1.7.5",
"angular-aria": "1.7.9",
"angular-chart.js": "^1.1.1",
@@ -32,13 +32,13 @@
"diff": "3.5.0",
"flatpickr": "4.5.2",
"font-awesome": "4.7.0",
"jquery": "^3.4.1",
"jquery": "^3.5.1",
"jquery-ui-dist": "1.12.1",
"jquery-ui-touch-punch": "0.2.3",
"lazyload-js": "1.0.0",
"moment": "2.22.2",
"ng-file-upload": "12.2.13",
"nouislider": "14.1.1",
"nouislider": "14.4.0",
"npm": "^6.14.0",
"signalr": "2.4.0",
"spectrum-colorpicker": "1.8.0",