Merge pull request #286 from cloudscribe/dev

merge changes from dev
cloudscribe · May 29, 2018 · d5c7e5e · d5c7e5e
2 parents 9ba76ce + a53641a
commit d5c7e5e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj b/src/cloudscribe.SimpleContent.Web.Mvc/cloudscribe.SimpleContent.Web.Mvc.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>MVC Controllers for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.31</VersionPrefix>
-    <AssemblyVersion>2.0.31</AssemblyVersion>
+    <VersionPrefix>2.0.32</VersionPrefix>
+    <AssemblyVersion>2.0.32</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Shared/CommentFormPartial.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap3/Views/Shared/CommentFormPartial.cshtml
@@ -6,7 +6,7 @@
 @{
     var path = Url.Action("AjaxPostComment", "Blog");
     var isAuthenticated = Context.User.Identity.IsAuthenticated;
-    var showRecaptcha = (Model.ProjectSettings.RecaptchaPublicKey.Length > 0) && !isAuthenticated;
+    var showRecaptcha = (!string.IsNullOrWhiteSpace(Model.ProjectSettings.RecaptchaPublicKey)) && !isAuthenticated;
 }
 <form id="commentform" asp-antiforgery="true" class="form-horizontal" data-blog-path="@path">
     <fieldset>

diff --git a/....SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj b/....SimpleContent.Web.Views.Bootstrap3/cloudscribe.SimpleContent.Web.Views.Bootstrap3.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Bootstrap 3 views for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.20</VersionPrefix>
-    <AssemblyVersion>2.0.20</AssemblyVersion>
+    <VersionPrefix>2.0.21</VersionPrefix>
+    <AssemblyVersion>2.0.21</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>cloudscribe.SimpleContent.Web.Views.Bootstrap3</AssemblyName>

diff --git a/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Shared/CommentFormPartial.cshtml b/src/cloudscribe.SimpleContent.Web.Views.Bootstrap4/Views/Shared/CommentFormPartial.cshtml
@@ -6,7 +6,7 @@
 @{
     var path = Url.Action("AjaxPostComment", "Blog");
     var isAuthenticated = Context.User.Identity.IsAuthenticated;
-    var showRecaptcha = (Model.ProjectSettings.RecaptchaPublicKey.Length > 0) && !isAuthenticated;
+    var showRecaptcha = (!string.IsNullOrWhiteSpace(Model.ProjectSettings.RecaptchaPublicKey)) && !isAuthenticated;
 }
 <form id="commentform" asp-antiforgery="true" class="form-horizontal" data-blog-path="@path">
     <fieldset>

diff --git a/....SimpleContent.Web.Views.Bootstrap4/cloudscribe.SimpleContent.Web.Views.Bootstrap4.csproj b/....SimpleContent.Web.Views.Bootstrap4/cloudscribe.SimpleContent.Web.Views.Bootstrap4.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Bootstrap 4 views for cloudscribe.SimpleContent.Web</Description>
-    <VersionPrefix>2.0.23</VersionPrefix>
-    <AssemblyVersion>2.0.23</AssemblyVersion>
+    <VersionPrefix>2.0.24</VersionPrefix>
+    <AssemblyVersion>2.0.24</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageTags>cloudscribe;SimpleContent;Bootstrap4</PackageTags>

diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database</Description>
-    <VersionPrefix>2.0.23</VersionPrefix>
-    <AssemblyVersion>2.0.23</AssemblyVersion>
+    <VersionPrefix>2.0.24</VersionPrefix>
+    <AssemblyVersion>2.0.24</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/...3067b4-919d-4910-acd1-4b3b1c210ecf/sitesettings/f83067b4-919d-4910-acd1-4b3b1c210ecf.json b/...3067b4-919d-4910-acd1-4b3b1c210ecf/sitesettings/f83067b4-919d-4910-acd1-4b3b1c210ecf.json
@@ -1 +1 @@
-{"CreatedUtc":"2016-08-04T12:03:49.9065086Z","ConcurrencyStamp":"638b4aa9-b618-452f-8b8b-53d7a0a0e20e","Theme":"custom1","AllowNewRegistration":true,"RequireConfirmedEmail":false,"RequireConfirmedPhone":false,"UseLdapAuth":false,"AllowDbFallbackWithLdap":false,"EmailLdapDbFallback":false,"AutoCreateLdapUserOnFirstLogin":true,"LdapServer":"","LdapDomain":"","LdapPort":389,"LdapRootDN":"","LdapUserDNKey":"CN","ReallyDeleteUsers":true,"UseEmailForLogin":true,"DisableDbAuth":false,"RequiresQuestionAndAnswer":false,"RequireApprovalBeforeLogin":false,"AccountApprovalEmailCsv":"","MaxInvalidPasswordAttempts":10,"MinRequiredPasswordLength":7,"PwdRequireNonAlpha":true,"PwdRequireLowercase":true,"PwdRequireUppercase":true,"PwdRequireDigit":true,"AllowPersistentLogin":true,"CaptchaOnRegistration":false,"CaptchaOnLogin":false,"RecaptchaPrivateKey":"6LedcNUSAAAAACf4VQ5sVkxsX4pn9wdLFW9Liiub","RecaptchaPublicKey":"6LedcNUSAAAAAHnKfOI2U48m7pMU2Zi3lsLwVSlO","UseInvisibleRecaptcha":false,"FacebookAppId":"foo","FacebookAppSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYqhFYCREi2MSWEcRy9PVQMDhRQyKMJDUILNU97lvMoUcnQGju4S5MFgGSCbiUAPBOMGZsST34kD5wpa5Vyn86L/Z41kGJ54Z1itvqhq8QKE+w==","MicrosoftClientId":"foo","MicrosoftClientSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYpmktJPCCLB36Q8Mj3TUg0iPy/gyC7ROVZkcjk8eQ5N+IOlQfLHTnOT2i3bX/m+tYBPFTffsW91xK/EdBOqkHvhOGkiKr3ppLXPyKHNnxWQ0g==","GoogleClientId":"foo","GoogleClientSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYoUet0YLvssltI0R8tAkU9BQwsVzg0AlfyHszdngVEeYQlFjdT+d/WDhS971SwR3tuWFeYMCAQVcQ85P+tggJdFiJnEHdhvuhOWNz2YrNwu1Q==","TwitterConsumerKey":"foo","TwitterConsumerSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYpX817Gs8Puurn+Q6OWuCeSIW0MKj7WUjfKMsMutueYeUA09epqjyobgVFIIEfokVzO3up/ZegLDj37mZDJBolHJApQgfC9106XlEP2kr7bFg==","OidConnectAppId":"","OidConnectAppSecret":"","OidConnectAuthority":"","OidConnectDisplayName":"","AddThisDotComUsername":null,"TimeZoneId":"America/New_York","CompanyName":"","CompanyStreetAddress":"","CompanyStreetAddress2":"","CompanyLocality":"","CompanyRegion":"","CompanyPostalCode":"","CompanyCountry":"","CompanyPhone":"","CompanyFax":"","CompanyPublicEmail":"","CompanyWebsite":null,"DefaultEmailFromAddress":"","DefaultEmailFromAlias":"","SmtpUser":"","SmtpPassword":"","SmtpPort":25,"SmtpPreferredEncoding":"","SmtpServer":"","SmtpRequiresAuth":false,"SmtpUseSsl":false,"DkimPublicKey":"","DkimPrivateKey":"","DkimDomain":"","DkimSelector":"","SignEmailWithDkim":false,"EmailSenderName":"SmtpMailSender","EmailApiKey":null,"EmailApiEndpoint":null,"SmsClientId":"","SmsSecureToken":"","SmsFrom":"","GoogleAnalyticsProfileId":null,"RegistrationAgreement":"<p>This is the agreement</p>\r\n","RegistrationPreamble":"<p>This is the preamble</p>\r\n","LoginInfoTop":"<p>Top instructions</p>\r\n","LoginInfoBottom":"<p>bottom instructions</p>\r\n","SiteIsClosed":false,"SiteIsClosedMessage":null,"PrivacyPolicy":"","IsDataProtected":true,"TermsUpdatedUtc":"2018-04-17T21:39:09.5156737Z","ForcedCulture":null,"ForcedUICulture":null,"Id":"f83067b4-919d-4910-acd1-4b3b1c210ecf","AliasId":"s1","SiteName":"Sample Site","SiteFolderName":null,"PreferredHostName":"","IsServerAdminSite":true}
+{"CreatedUtc":"2016-08-04T12:03:49.9065086Z","ConcurrencyStamp":"638b4aa9-b618-452f-8b8b-53d7a0a0e20e","Theme":"custom1","AllowNewRegistration":true,"RequireConfirmedEmail":false,"RequireConfirmedPhone":false,"UseLdapAuth":false,"AllowDbFallbackWithLdap":false,"EmailLdapDbFallback":false,"AutoCreateLdapUserOnFirstLogin":true,"LdapServer":"","LdapDomain":"","LdapPort":389,"LdapRootDN":"","LdapUserDNKey":"CN","ReallyDeleteUsers":true,"UseEmailForLogin":true,"DisableDbAuth":false,"RequiresQuestionAndAnswer":false,"RequireApprovalBeforeLogin":false,"AccountApprovalEmailCsv":"","MaxInvalidPasswordAttempts":10,"MinRequiredPasswordLength":7,"PwdRequireNonAlpha":true,"PwdRequireLowercase":true,"PwdRequireUppercase":true,"PwdRequireDigit":true,"AllowPersistentLogin":true,"CaptchaOnRegistration":false,"CaptchaOnLogin":false,"RecaptchaPrivateKey":"6LedcNUSAAAAACf4VQ5sVkxsX4pn9wdLFW9Liiub","RecaptchaPublicKey":"6LedcNUSAAAAAHnKfOI2U48m7pMU2Zi3lsLwVSlO","UseInvisibleRecaptcha":false,"FacebookAppId":"foo","FacebookAppSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYrBesnqVrTDsFm62nDuyq4oUP/3/mL5amGWRwd7pL/SkxMkmUm4p8Ziq49yGQav9SfnDCcY5sVsYk6lWrkOv0t/g1Zd1FMRLMdI8czz/UIZGw==","MicrosoftClientId":"foo","MicrosoftClientSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYplhyy9XyFwD+rigPOfW2XUvkz3tbi2xIeAt/FfRGE57qJBWhYqGoKYTmLCHNlan0GOS0A7Oxebwp+C91bZ00hJR5uFeYfcM1Mq7FRmNlsmuA==","GoogleClientId":"foo","GoogleClientSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYr1AHxMWDaakh1UchVcGmH1J/RAunPuev/DzdkgpKpjxSBk2pwg9O6FF4Oz/AHXnxZzTRo7Tzmuil+diKh5rf4xjOtt7Uthu+/pnT40hCWfTw==","TwitterConsumerKey":"foo","TwitterConsumerSecret":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYpybFMzdg2lj2yy3jLep+4cLjkaipiGyTt2F0Ye0gyaZT5Ll9rWwZ50U+BhN3HlseuCCpBClVfhpSq7fPKrcqc1KySE8xgfl6oe++3cQFa6sw==","OidConnectAppId":"","OidConnectAppSecret":"","OidConnectAuthority":"","OidConnectDisplayName":"","AddThisDotComUsername":null,"TimeZoneId":"America/New_York","CompanyName":"","CompanyStreetAddress":"","CompanyStreetAddress2":"","CompanyLocality":"","CompanyRegion":"","CompanyPostalCode":"","CompanyCountry":"","CompanyPhone":"","CompanyFax":"","CompanyPublicEmail":"","CompanyWebsite":null,"DefaultEmailFromAddress":"noreply@esdm.co.uk","DefaultEmailFromAlias":null,"SmtpUser":"noreply@esdm.co.uk","SmtpPassword":"CfDJ8NzbDy+mYa5Hm1s/RIiXnYp/nctOBW2NH/FnowgkaC6jNVuP/xek8lGu6A79VBjNTsv75VVFTLX6sAA/wXLLx8GMyY0iNLnVvDjp7GeIvcNS/yq83YpOhy24V0pyc8oq9Q==","SmtpPort":25,"SmtpPreferredEncoding":"","SmtpServer":"smtp.esdm.co.uk","SmtpRequiresAuth":true,"SmtpUseSsl":false,"DkimPublicKey":"","DkimPrivateKey":"","DkimDomain":"","DkimSelector":"","SignEmailWithDkim":false,"EmailSenderName":"SmtpMailSender","EmailApiKey":null,"EmailApiEndpoint":null,"SmsClientId":"","SmsSecureToken":"","SmsFrom":"","GoogleAnalyticsProfileId":null,"RegistrationAgreement":"<p>This is the agreement</p>\r\n","RegistrationPreamble":"<p>This is the preamble</p>\r\n","LoginInfoTop":"<p>Top instructions</p>\r\n","LoginInfoBottom":"<p>bottom instructions</p>\r\n","SiteIsClosed":false,"SiteIsClosedMessage":null,"PrivacyPolicy":"","IsDataProtected":true,"TermsUpdatedUtc":"2018-04-17T21:39:09.5156737Z","ForcedCulture":null,"ForcedUICulture":null,"Id":"f83067b4-919d-4910-acd1-4b3b1c210ecf","AliasId":"s1","SiteName":"Sample Site","SiteFolderName":null,"PreferredHostName":"","IsServerAdminSite":true}