-
+
{{node.createDateFormatted}} by {{ node.owner.name }}
@@ -150,13 +150,13 @@
ng-change="updateTemplate(node.template)">
-
+ Open
-
+
{{ node.id }}
{{ node.key }}
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 891e04d3a2..28376bf593 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -139,24 +139,28 @@
Viewing for
- Delete Content performed by user
- Unpublish performed by user
- Save and Publish performed by user
- Save Content performed by user
- Move Content performed by user
- Copy Content performed by user
- Content rollback performed by user
- Content Send To Publish performed by user
- Content Send To Translation performed by user
+ Content deleted
+ Content unpublished
+ Content saved and Published
+ Content cultures %0% saved and published
+ Content saved
+ Content cultures %0% saved
+ Content moved
+ Content copied
+ Content rolled back
+ Content sent for publishing
+ Content cultures %0% sent for publishingCopyPublish
+ PublishMoveSave
+ SaveDeleteUnpublishRollbackSend To Publish
- Send To Translation
+ Send To PublishTo change the document type for the selected content, first select from the list of valid types for this location.
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index f9138f3baf..f466ff699a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -144,24 +144,28 @@
Viewing for
- Delete Content performed by user
- Unpublish performed by user
- Save and Publish performed by user
- Save Content performed by user
- Move Content performed by user
- Copy Content performed by user
- Content rollback performed by user
- Content Send To Publish performed by user
- Content Send To Translation performed by user
+ Content deleted
+ Content unpublished
+ Content saved and Published
+ Content cultures %0% saved and published
+ Content saved
+ Content cultures %0% saved
+ Content moved
+ Content copied
+ Content rolled back
+ Content sent for publishing
+ Content cultures %0% sent for publishingCopyPublish
+ PublishMoveSave
+ SaveDeleteUnpublishRollbackSend To Publish
- Send To Translation
+ Send To PublishTo change the document type for the selected content, first select from the list of valid types for this location.
diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs
index 1205226b8f..dcd69d10b7 100644
--- a/src/Umbraco.Web/Editors/LogController.cs
+++ b/src/Umbraco.Web/Editors/LogController.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Models;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
namespace Umbraco.Web.Editors
{
@@ -16,6 +17,7 @@ namespace Umbraco.Web.Editors
[PluginController("UmbracoApi")]
public class LogController : UmbracoAuthorizedJsonController
{
+ [UmbracoApplicationAuthorize(Core.Constants.Applications.Content, Core.Constants.Applications.Media)]
public PagedResult GetPagedEntityLog(int id,
int pageNumber = 1,
int pageSize = 0,
diff --git a/src/Umbraco.Web/Models/ContentEditing/AuditLog.cs b/src/Umbraco.Web/Models/ContentEditing/AuditLog.cs
index 2e0dca3fbb..9074accdfe 100644
--- a/src/Umbraco.Web/Models/ContentEditing/AuditLog.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/AuditLog.cs
@@ -24,7 +24,13 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "logType")]
public string LogType { get; set; }
+ [DataMember(Name = "entityType")]
+ public string EntityType { get; set; }
+
[DataMember(Name = "comment")]
public string Comment { get; set; }
+
+ [DataMember(Name = "parameters")]
+ public string Parameters { get; set; }
}
}
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 709f0d719a..85d7128629 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -33,9 +33,9 @@ namespace Umbraco.Web.Security
public WebSecurity(HttpContextBase httpContext, IUserService userService, IGlobalSettings globalSettings)
{
- _httpContext = httpContext;
- _userService = userService;
- _globalSettings = globalSettings;
+ _httpContext = httpContext ?? throw new ArgumentNullException(nameof(httpContext));
+ _userService = userService ?? throw new ArgumentNullException(nameof(userService));
+ _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
}
///