yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v8' into dev-v8-ExamineV2

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Plugins/PluginManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
#	src/Umbraco.Web.UI/config/ClientDependency.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/UmbracoExamine/UmbracoContentIndexer.cs
This commit is contained in:
Shannon
2016-05-19 16:32:22 +02:00
parent 9ac2c94373 6975642a98
commit f9ba3fe76f
349 changed files with 11422 additions and 10967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/WebServices/BulkPublishController.cs
View File

@@ -4,11 +4,8 @@ using System.Text;
using System.Web.Mvc;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Web.Mvc;
using umbraco;
using umbraco.cms.businesslogic.web;
namespace Umbraco.Web.WebServices
{
@@ -56,7 +53,7 @@ namespace Umbraco.Web.WebServices
private string GetMessageForStatuses(IEnumerable<PublishStatus> statuses, IContent doc)
{
//if all are successful then just say it was successful
if (statuses.All(x => ((int) x.StatusType) < 10))
if (statuses.All(x => x.StatusType.IsSuccess()))
{
return Services.TextService.Localize("publish/nodePublishAll", new[] { doc.Name});
}

9
src/Umbraco.Web/WebServices/CoreStringsController.cs
View File

@@ -1,14 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Mvc;
using Umbraco.Core;
using Umbraco.Core.Strings;
using Umbraco.Core.Models;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Web.Mvc;
using umbraco;
namespace Umbraco.Web.WebServices
{

2
src/Umbraco.Web/WebServices/DomainsApiController.cs
View File

@@ -136,7 +136,7 @@ namespace Umbraco.Web.WebServices
xnames.Add(xcontent.Name);
if (xcontent.ParentId < -1)
xnames.Add("Recycle Bin");
xcontent = xcontent.Parent();
xcontent = xcontent.Parent(Services.ContentService);
}
xnames.Reverse();
domainModel.Other = "/" + string.Join("/", xnames);

1
src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
View File

@@ -11,6 +11,7 @@ using Examine.Providers;
using Lucene.Net.Search;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Plugins;
using Umbraco.Web.Search;
using Umbraco.Web.WebApi;
using Umbraco.Web.WebApi.Filters;

5
src/Umbraco.Web/WebServices/ScheduledPublishController.cs
View File

@@ -2,7 +2,7 @@
using System.Web.Mvc;
using umbraco;
using Umbraco.Core.Logging;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Web.Mvc;
namespace Umbraco.Web.WebServices
@@ -27,8 +27,7 @@ namespace Umbraco.Web.WebServices
// DO not run publishing if content is re-loading
if (content.Instance.isInitializing == false)
{
var publisher = new ScheduledPublisher(Services.ContentService);
publisher.CheckPendingAndProcess();
Services.ContentService.WithResult().PerformScheduledPublish();
}
return Json(new