Merge branch 'master' into streamlining-di

Kentico · Mar 21, 2019 · 269593c · 269593c
2 parents 0242c30 + 994dfd6
commit 269593c
Show file tree

Hide file tree

Showing 14 changed files with 465 additions and 426 deletions.
diff --git a/Business/Business.csproj b/Business/Business.csproj
diff --git a/Business/app.config b/Business/app.config
@@ -10,6 +10,34 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Business/packages.config b/Business/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AngleSharp" version="0.9.9" targetFramework="net461" />
+  <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
   <package id="Autofac" version="4.8.1" targetFramework="net461" />
   <package id="AWSSDK.Core" version="3.1.10.0" targetFramework="net461" />
   <package id="AWSSDK.S3" version="3.1.9.0" targetFramework="net461" />
@@ -9,25 +10,40 @@
   <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net461" />
   <package id="Facebook" version="6.4.2" targetFramework="net461" />
   <package id="GlobalLink.Connect" version="4.18.3.1" targetFramework="net461" />
-  <package id="Kentico.Libraries" version="12.0.0" targetFramework="net461" />
+  <package id="Kentico.Libraries" version="12.0.14" targetFramework="net461" />
   <package id="linqtotwitter" version="4.0.0" targetFramework="net461" />
   <package id="MaxMind.Db" version="2.4.0" targetFramework="net461" />
   <package id="MaxMind.GeoIP2" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net461" />
   <package id="Microsoft.Azure.Search" version="3.0.2" targetFramework="net461" />
   <package id="Microsoft.CSharp" version="4.4.1" targetFramework="net461" />
   <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net461" />
   <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net461" />
   <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net461" />
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.4" targetFramework="net461" />
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.4" targetFramework="net461" />
   <package id="Microsoft.SharePointOnline.CSOM" version="16.1.6621.1200" targetFramework="net461" />
   <package id="Microsoft.Spatial" version="6.15.0" targetFramework="net461" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net461" />
   <package id="Mono.Cecil" version="0.10.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="NuGet.Core" version="2.14.0" targetFramework="net461" />
   <package id="OpenPop.NET" version="2.0.4.369" targetFramework="net461" />
+  <package id="Owin" version="1.0" targetFramework="net461" />
   <package id="PayPal" version="1.8.0" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net461" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net461" />
@@ -42,5 +58,6 @@
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
+  <package id="WebGrease" version="1.6.0" targetFramework="net461" />
   <package id="WindowsAzure.Storage" version="7.2.0" targetFramework="net461" />
 </packages>
diff --git a/Db/MedioClinic.zip b/Db/MedioClinic.zip
diff --git a/MedioClinic/App_Data/Global/Resources/Kentico.FormBuilder.resx b/MedioClinic/App_Data/Global/Resources/Kentico.FormBuilder.resx
@@ -376,7 +376,7 @@
     <value>Smart fields feature is not available in the Kentico edition you are using.</value>
   </data>
   <data name="kentico.formbuilder.component.name.invalidformat" xml:space="preserve">
-    <value>Field name '{0}' is not a valid code name.</value>
+    <value>The field name '{0}' is invalid. The field name must begin with a letter or an underscore ('_') character. It may contain letters, numbers, and underscore characters.</value>
   </data>
   <data name="kentico.formbuilder.component.name.notunique" xml:space="preserve">
     <value>Field name '{0}' is not unique in the form.</value>

diff --git a/MedioClinic/Content/Css/Master/materialize.min.css b/MedioClinic/Content/Css/Master/materialize.min.css