diff --git a/build/Articulate.nuspec b/build/Articulate.nuspec index 3a4223dc..69cdb988 100644 --- a/build/Articulate.nuspec +++ b/build/Articulate.nuspec @@ -16,7 +16,7 @@ https://raw.githubusercontent.com/Shazwazza/Articulate/master/assets/Icon-transparent.png - + diff --git a/src/Articulate.Web/Articulate.Web.csproj b/src/Articulate.Web/Articulate.Web.csproj index 3ae48733..5d5994e6 100644 --- a/src/Articulate.Web/Articulate.Web.csproj +++ b/src/Articulate.Web/Articulate.Web.csproj @@ -1,7 +1,7 @@  + - @@ -63,8 +63,8 @@ ..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll True - - ..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll ..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll @@ -76,8 +76,8 @@ ..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll - - ..\packages\Examine.1.0.1\lib\net452\Examine.dll + + ..\packages\Examine.1.2.2\lib\net452\Examine.dll ..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll @@ -85,11 +85,14 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll + + ..\packages\ImageProcessor.2.9.1\lib\net452\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.4.10.0.100\lib\net452\ImageProcessor.Web.dll + + ..\packages\ImageProcessor.Web.4.12.1\lib\net452\ImageProcessor.Web.dll + + + ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll @@ -112,8 +115,14 @@ ..\packages\Markdown.2.2.1\lib\net451\Markdown.dll + + ..\packages\MessagePack.2.2.85\lib\netstandard2.0\MessagePack.dll + + + ..\packages\MessagePack.Annotations.2.2.85\lib\netstandard2.0\MessagePack.Annotations.dll + - ..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll + ..\packages\Microsoft.AspNet.Identity.Core.2.2.4\lib\net45\Microsoft.AspNet.Identity.Core.dll ..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll @@ -121,6 +130,9 @@ ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeAnalysis.Common.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll @@ -177,37 +189,37 @@ ..\packages\Semver.2.0.4\lib\net452\Semver.dll - ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll + ..\packages\Serilog.2.10.0\lib\net46\Serilog.dll - ..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll + ..\packages\Serilog.Enrichers.Process.2.0.2\lib\net45\Serilog.Enrichers.Process.dll - ..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll + ..\packages\Serilog.Enrichers.Thread.3.1.0\lib\net45\Serilog.Enrichers.Thread.dll - - ..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll + + ..\packages\Serilog.Filters.Expressions.2.1.0\lib\net45\Serilog.Filters.Expressions.dll - - ..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll + + ..\packages\Serilog.Formatting.Compact.1.1.0\lib\net452\Serilog.Formatting.Compact.dll - - ..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll + + ..\packages\Serilog.Formatting.Compact.Reader.1.0.5\lib\net45\Serilog.Formatting.Compact.Reader.dll ..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll - - ..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll + + ..\packages\Serilog.Sinks.Async.1.5.0\lib\net461\Serilog.Sinks.Async.dll - ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll + ..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll - - ..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll + + ..\packages\Serilog.Sinks.Map.1.0.2\lib\netstandard2.0\Serilog.Sinks.Map.dll - ..\packages\Superpower.2.0.0\lib\net45\Superpower.dll + ..\packages\Superpower.2.3.0\lib\net45\Superpower.dll @@ -215,8 +227,11 @@ True True - - ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll @@ -277,6 +292,9 @@ True True + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + @@ -292,6 +310,9 @@ + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll True @@ -306,6 +327,9 @@ True + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll True @@ -338,15 +362,15 @@ True True - - ..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll + + ..\packages\System.Text.Encoding.CodePages.4.7.1\lib\net461\System.Text.Encoding.CodePages.dll ..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll - - ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll @@ -415,19 +439,22 @@ True - ..\packages\UmbracoCms.Core.8.2.3\lib\net472\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.8.18.13\lib\net472\Umbraco.Core.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Examine.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Examine.dll - ..\packages\Umbraco.ModelsBuilder.8.1.0\lib\net472\Umbraco.ModelsBuilder.dll + ..\packages\Umbraco.ModelsBuilder.8.1.6\lib\net472\Umbraco.ModelsBuilder.dll + + + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.ModelsBuilder.Embedded.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Web.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Web.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Web.UI.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Web.UI.dll @@ -602,22 +629,22 @@ - - - + + + Web.config @@ -682,14 +709,14 @@ - - + + - + - + \ No newline at end of file diff --git a/src/Articulate.Web/Web.config b/src/Articulate.Web/Web.config index ff138cca..e5325b4b 100644 --- a/src/Articulate.Web/Web.config +++ b/src/Articulate.Web/Web.config @@ -11,7 +11,6 @@
-
@@ -82,9 +81,8 @@ - - + @@ -119,14 +117,14 @@ - - - - - + + + + + + - @@ -137,10 +135,9 @@ - - + @@ -149,15 +146,11 @@ - - - - @@ -202,8 +195,6 @@ --> - - @@ -217,8 +208,16 @@ - - + + + + + + + + + + @@ -242,7 +241,7 @@ - + @@ -260,6 +259,22 @@ + + + + + + + + + + + + + + + + @@ -283,4 +298,4 @@ - + \ No newline at end of file diff --git a/src/Articulate.Web/config/BackOfficeTours/getting-started.json b/src/Articulate.Web/config/BackOfficeTours/getting-started.json index e300e656..7acc818f 100644 --- a/src/Articulate.Web/config/BackOfficeTours/getting-started.json +++ b/src/Articulate.Web/config/BackOfficeTours/getting-started.json @@ -1,4 +1,26 @@ [ + { + "name": "Email Marketing", + "alias": "umbEmailMarketing", + "group": "Email Marketing", + "groupOrder": 10, + "hidden": true, + "requiredSections": [ + "content" + ], + "steps": [ + { + "title": "Do you want to stay updated on everything Umbraco?", + "content": "

Thank you for using Umbraco! Would you like to stay up-to-date with Umbraco product updates, security advisories, community news and special offers? Sign up for our newsletter and never miss out on the latest Umbraco news.

By signing up, you agree that we can use your info according to our privacy policy.

", + "view": "emails", + "type": "promotion" + }, + { + "title": "Thank you for subscribing to our mailing list", + "view": "confirm" + } + ] + }, { "name": "Introduction", "alias": "umbIntroIntroduction", @@ -25,7 +47,15 @@ "element": "[data-element='section-content']", "elementPreventClick": true, "title": "Sections", - "content": "Each area in Umbraco is called a Section. Right now you are in the Content section, when you want to go to another section simply click on the appropriate name in the main menu and you'll be there in no time.", + "content": "Each area in Umbraco is called a Section. The current section is highlighted in the main menu, when you want to go to another section click on the name and you'll be there in no time.", + "backdropOpacity": 0.6 + }, + { + "element": "[data-element='section-content']", + "skipStepIfVisible": "[data-element='dashboard']", + "title": "Content section", + "content": "Try clicking Content to enter the content section.", + "event": "click", "backdropOpacity": 0.6 }, { @@ -130,10 +160,16 @@ "title": "Enter a description", "content": "

A description helps to pick the right document type when creating content.

Write a description for our Home page. It could be:

The home page of the website

" }, + { + "element": "[data-element='groups-builder']", + "elementPreventClick": true, + "title": "Properties, groups, and tabs", + "content": "A Document Type consist of Properties (data fields/attributes) where an editor can input data. For complex Document Types you can organize Properties in groups and tabs." + }, { "element": "[data-element='group-add']", "title": "Add group", - "content": "Group are used to organize properties on content in the Content section. Click Add Group to add a group.", + "content": "In this tour we only need a group. Click Add Group to add a group.", "event": "click" }, { @@ -166,27 +202,21 @@ "event": "click" }, { - "element": "[data-element~='editor-data-type-picker']", + "element": "[ng-controller*='Umbraco.Editors.DataTypePickerController'] [data-element='editor-data-type-picker']", "elementPreventClick": true, "title": "Editor picker", - "content": "

In the editor picker dialog we can pick one of the many built-in editors.

You can choose from preconfigured data types (Reuse) or create a new configuration (Available editors).

" + "content": "

In the editor picker dialog we can pick one of the many built-in editors.

" }, { - "element": "[data-element~='editor-data-type-picker'] [data-element='editor-Textarea']", + "element": "[data-element~='editor-data-type-picker'] [data-element='datatype-Textarea']", "title": "Select editor", "content": "Select the Textarea editor. This will add a textarea to the Welcome Text property.", "event": "click" }, { - "element": "[data-element~='editor-data-type-settings']", - "elementPreventClick": true, + "element": "[data-element='editor-data-type-picker'] [data-element='datatypeconfig-Textarea']", "title": "Editor settings", - "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed." - }, - { - "element": "[data-element~='editor-data-type-settings'] [data-element='button-submit']", - "title": "Save editor", - "content": "Click Submit to save the changes.", + "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed.", "event": "click" }, { @@ -256,9 +286,9 @@ "view": "nodename" }, { - "element": "[data-element='editor-content'] [data-element='property-welcomeText']", + "element": "[data-element='editor-content'] [data-element='property-welcomeText'] > div", "title": "Add a welcome text", - "content": "

Add content to the Welcome Text field.

If you don't have any ideas here is a start:

I am learning Umbraco. High Five I Rock #H5IR
.

" + "content": "

Add content to the Welcome Text field.

If you don't have any ideas here is a start:

I am learning Umbraco. High Five I Rock #H5IR

" }, { "element": "[data-element='editor-content'] [data-element='button-saveAndPublish']", @@ -295,7 +325,8 @@ "content": "

To see all our templates click the small triangle to the left of the templates node.

", "event": "click", "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-expand']", - "view": "templatetree" + "view": "templatetree", + "skipStepIfVisible": "#tree [data-element='tree-item-templates'] > div > button[data-element=tree-item-expand] span.icon-navigation-down" }, { "element": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page']", diff --git a/src/Articulate.Web/config/grid.editors.config.js b/src/Articulate.Web/config/grid.editors.config.js index 12fa726f..210d167f 100644 --- a/src/Articulate.Web/config/grid.editors.config.js +++ b/src/Articulate.Web/config/grid.editors.config.js @@ -7,12 +7,14 @@ }, { "name": "Image", + "nameTemplate": "{{ value && value.udi ? (value.udi | ncNodeName) : '' }}", "alias": "media", "view": "media", "icon": "icon-picture" }, { "name": "Macro", + "nameTemplate": "{{ value && value.macroAlias ? value.macroAlias : '' }}", "alias": "macro", "view": "macro", "icon": "icon-settings-alt" @@ -25,6 +27,7 @@ }, { "name": "Headline", + "nameTemplate": "{{ value }}", "alias": "headline", "view": "textstring", "icon": "icon-coin", @@ -35,6 +38,7 @@ }, { "name": "Quote", + "nameTemplate": "{{ value ? value.substring(0,32) + (value.length > 32 ? '...' : '') : '' }}", "alias": "quote", "view": "textstring", "icon": "icon-quote", @@ -43,4 +47,4 @@ "markup": "
#value#
" } } -] \ No newline at end of file +] diff --git a/src/Articulate.Web/config/umbracoSettings.config b/src/Articulate.Web/config/umbracoSettings.config index a4848b2f..d63f83dc 100644 --- a/src/Articulate.Web/config/umbracoSettings.config +++ b/src/Articulate.Web/config/umbracoSettings.config @@ -1,4 +1,4 @@ - + - In Preview Mode - click to end - ]]> + + Preview mode + + … + + + Click to end preview mode + + + + + ]]> + - ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess + ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess,xamlx assets/img/login.jpg + + assets/img/application/umbraco_logo_white.svg + + @@ -69,7 +205,7 @@ - + - + + + diff --git a/src/Articulate.Web/packages.config b/src/Articulate.Web/packages.config index 795c486c..7ea5d342 100644 --- a/src/Articulate.Web/packages.config +++ b/src/Articulate.Web/packages.config @@ -1,15 +1,16 @@ - + - + - + - - - + + + + @@ -17,7 +18,9 @@ - + + + @@ -28,6 +31,7 @@ + @@ -49,22 +53,23 @@ - - - - - - + + + + + + - - - + + + - + + - + @@ -79,10 +84,15 @@ + + + + + @@ -91,12 +101,12 @@ - + - + @@ -105,11 +115,11 @@ - - + + - - - + + + - + \ No newline at end of file diff --git a/src/Articulate/Articulate.csproj b/src/Articulate/Articulate.csproj index cac88866..fb2a086d 100644 --- a/src/Articulate/Articulate.csproj +++ b/src/Articulate/Articulate.csproj @@ -196,8 +196,8 @@ ..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll - - ..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll ..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll @@ -211,8 +211,8 @@ ..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll - - ..\packages\Examine.1.0.1\lib\net452\Examine.dll + + ..\packages\Examine.1.2.2\lib\net452\Examine.dll ..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll @@ -220,8 +220,11 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll + + ..\packages\ImageProcessor.2.9.1\lib\net452\ImageProcessor.dll + + + ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll @@ -247,8 +250,14 @@ ..\packages\Markdown.2.2.1\lib\net451\Markdown.dll + + ..\packages\MessagePack.2.2.85\lib\netstandard2.0\MessagePack.dll + + + ..\packages\MessagePack.Annotations.2.2.85\lib\netstandard2.0\MessagePack.Annotations.dll + - ..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll + ..\packages\Microsoft.AspNet.Identity.Core.2.2.4\lib\net45\Microsoft.AspNet.Identity.Core.dll ..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll @@ -256,6 +265,9 @@ ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll @@ -300,42 +312,45 @@ ..\packages\Semver.2.0.4\lib\net452\Semver.dll - ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll + ..\packages\Serilog.2.10.0\lib\net46\Serilog.dll - ..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll + ..\packages\Serilog.Enrichers.Process.2.0.2\lib\net45\Serilog.Enrichers.Process.dll - ..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll + ..\packages\Serilog.Enrichers.Thread.3.1.0\lib\net45\Serilog.Enrichers.Thread.dll - - ..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll + + ..\packages\Serilog.Filters.Expressions.2.1.0\lib\net45\Serilog.Filters.Expressions.dll - - ..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll + + ..\packages\Serilog.Formatting.Compact.1.1.0\lib\net452\Serilog.Formatting.Compact.dll - - ..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll + + ..\packages\Serilog.Formatting.Compact.Reader.1.0.5\lib\net45\Serilog.Formatting.Compact.Reader.dll ..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll - - ..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll + + ..\packages\Serilog.Sinks.Async.1.5.0\lib\net461\Serilog.Sinks.Async.dll - ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll + ..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll - - ..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll + + ..\packages\Serilog.Sinks.Map.1.0.2\lib\netstandard2.0\Serilog.Sinks.Map.dll - ..\packages\Superpower.2.0.0\lib\net45\Superpower.dll + ..\packages\Superpower.2.3.0\lib\net45\Superpower.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll + @@ -369,16 +384,22 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Text.Encoding.CodePages.4.7.1\lib\net461\System.Text.Encoding.CodePages.dll + ..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -413,16 +434,19 @@ - ..\packages\UmbracoCms.Core.8.2.3\lib\net472\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.8.18.13\lib\net472\Umbraco.Core.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Examine.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Examine.dll + + + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.ModelsBuilder.Embedded.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Web.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Web.dll - ..\packages\UmbracoCms.Web.8.2.3\lib\net472\Umbraco.Web.UI.dll + ..\packages\UmbracoCms.Web.8.18.13\lib\net472\Umbraco.Web.UI.dll @@ -447,4 +471,4 @@ --> - + \ No newline at end of file diff --git a/src/Articulate/PropertyEditors/ArticulateMarkdownPropertyEditor.cs b/src/Articulate/PropertyEditors/ArticulateMarkdownPropertyEditor.cs index d82cc03a..b6c41deb 100644 --- a/src/Articulate/PropertyEditors/ArticulateMarkdownPropertyEditor.cs +++ b/src/Articulate/PropertyEditors/ArticulateMarkdownPropertyEditor.cs @@ -3,6 +3,7 @@ using Umbraco.Core.Logging; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; +using Umbraco.Core.Security; using Umbraco.Web.PropertyEditors; using Umbraco.Web.PropertyEditors.ValueConverters; @@ -12,7 +13,7 @@ namespace Articulate.PropertyEditors [DataEditor("Articulate.MarkdownEditor", "Articulate Markdown editor", "markdowneditor", ValueType = "TEXT")] public class ArticulateMarkdownPropertyEditor : MarkdownPropertyEditor { - public ArticulateMarkdownPropertyEditor(ILogger logger) : base(logger) + public ArticulateMarkdownPropertyEditor(ILogger logger, IMarkdownSanitizer markdownSanitizer) : base(logger, markdownSanitizer) { } } diff --git a/src/Articulate/app.config b/src/Articulate/app.config index bf23910e..e3865a07 100644 --- a/src/Articulate/app.config +++ b/src/Articulate/app.config @@ -1,4 +1,4 @@ - + @@ -50,6 +50,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/Articulate/packages.config b/src/Articulate/packages.config index 203df052..cde94795 100644 --- a/src/Articulate/packages.config +++ b/src/Articulate/packages.config @@ -1,16 +1,17 @@ - + - + - + - + + @@ -19,7 +20,9 @@ - + + + @@ -29,6 +32,7 @@ + @@ -43,28 +47,33 @@ - - - - - - + + + + + + - - - + + + - + + - + + + + + - - + + - + \ No newline at end of file