diff --git a/build/V8-Docs-Pipeline.yml b/build/V8-Docs-Pipeline.yml index 1df4092397..56e8fde60c 100644 --- a/build/V8-Docs-Pipeline.yml +++ b/build/V8-Docs-Pipeline.yml @@ -37,6 +37,7 @@ jobs: script: | $uenv=./build.ps1 -get -doc $uenv.SandboxNode() + $uenv.CompileBelle() $uenv.PrepareAngularDocs() $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json" $uenv.PrepareCSharpDocs() diff --git a/build/build.ps1 b/build/build.ps1 index 185d1b8ff6..c2c5bdd232 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -475,7 +475,7 @@ # change baseUrl $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/" $IndexPath = "./api/index.html" - (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath + (Get-Content $IndexPath).replace('origin + location.href.substr(origin.length).replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath # zip it & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Docs\api\*.*" diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs index 6990a7f7da..7a4fc83253 100644 --- a/src/Umbraco.Core/Models/IContent.cs +++ b/src/Umbraco.Core/Models/IContent.cs @@ -25,6 +25,7 @@ namespace Umbraco.Core.Models /// /// Gets a value indicating whether the content is published. /// + /// The property tells you which version of the content is currently published. bool Published { get; set; } PublishedState PublishedState { get; set; } @@ -32,10 +33,11 @@ namespace Umbraco.Core.Models /// /// Gets a value indicating whether the content has been edited. /// + /// Will return `true` once unpublished edits have been made after the version with has been published. bool Edited { get; set; } /// - /// Gets the published version identifier. + /// Gets the version identifier for the currently published version of the content. /// int PublishedVersionId { get; set; } @@ -129,6 +131,6 @@ namespace Umbraco.Core.Models /// /// IContent DeepCloneWithResetIdentities(); - + } } diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index 542d45c479..d272c77397 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -31,6 +31,6 @@ exports.build = series(parallel(dependencies, js, less, views), testUnit); exports.dev = series(setDevelopmentMode, parallel(dependencies, js, less, views), watchTask); exports.watch = series(watchTask); // -exports.runTests = series(setTestMode, parallel(js, testUnit)); -exports.runUnit = series(setTestMode, parallel(js, runUnitTestServer), watchTask); +exports.runTests = series(setTestMode, series(js, testUnit)); +exports.runUnit = series(setTestMode, series(js, runUnitTestServer), watchTask); exports.testE2e = series(setTestMode, parallel(testE2e)); diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index f6fc5ca1be..5883f59be8 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -12,7 +12,7 @@ module.exports = function (config) { // Jasmine plugins 'node_modules/jasmine-promise-matchers/dist/jasmine-promise-matchers.js', - + //libraries 'node_modules/jquery/dist/jquery.min.js', 'node_modules/angular/angular.js', diff --git a/src/Umbraco.Web.UI.Docs/gulpfile.js b/src/Umbraco.Web.UI.Docs/gulpfile.js index 5dd4c57032..a7269ec8b7 100644 --- a/src/Umbraco.Web.UI.Docs/gulpfile.js +++ b/src/Umbraco.Web.UI.Docs/gulpfile.js @@ -32,7 +32,8 @@ gulp.task('docs', [], function (cb) { } }) .pipe(gulpDocs.process(options)) - .pipe(gulp.dest('./api')); + .pipe(gulp.dest('./api')) + .pipe(connect.reload()); }); diff --git a/src/Umbraco.Web.UI.Docs/package.json b/src/Umbraco.Web.UI.Docs/package.json index 6e58f958cf..f216b4b129 100644 --- a/src/Umbraco.Web.UI.Docs/package.json +++ b/src/Umbraco.Web.UI.Docs/package.json @@ -1,7 +1,6 @@ { "private": true, "scripts": { - "preinstall": "npx npm-force-resolutions", "docs": "gulp docs", "start": "gulp docs", "default": "gulp docs", @@ -9,9 +8,6 @@ "serve": "gulp watch", "watch": "gulp watch" }, - "resolutions": { - "graceful-fs": "4.2.3" - }, "devDependencies": { "gulp": "^3.9.1", "gulp-connect": "5.6.1",