diff --git a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj index 09eee3a..421436f 100644 --- a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj +++ b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj @@ -111,8 +111,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll True - - ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.Web.OneReport.Lib/packages.config b/Vrh.Web.OneReport.Lib/packages.config index 4c207ef..f6bde7f 100644 --- a/Vrh.Web.OneReport.Lib/packages.config +++ b/Vrh.Web.OneReport.Lib/packages.config @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/Vrh.Web.Reporting/Areas/iScheduler/Views/Shared/ValidationSummary.cshtml b/Vrh.Web.Reporting/Areas/iScheduler/Views/Shared/ValidationSummary.cshtml index 1ad53af..eb336d1 100644 --- a/Vrh.Web.Reporting/Areas/iScheduler/Views/Shared/ValidationSummary.cshtml +++ b/Vrh.Web.Reporting/Areas/iScheduler/Views/Shared/ValidationSummary.cshtml @@ -1,4 +1,5 @@ @using Vrh.Web.Common.Lib; +@using VRH.Log4Pro.WebTools; @if (!ViewData.ModelState.IsValid && !string.IsNullOrEmpty(Html.ValidationSummaryMessage(true))) { diff --git a/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/Shared/ValidationSummary.cshtml b/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/Shared/ValidationSummary.cshtml index 1ad53af..eb336d1 100644 --- a/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/Shared/ValidationSummary.cshtml +++ b/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/Shared/ValidationSummary.cshtml @@ -1,4 +1,5 @@ @using Vrh.Web.Common.Lib; +@using VRH.Log4Pro.WebTools; @if (!ViewData.ModelState.IsValid && !string.IsNullOrEmpty(Html.ValidationSummaryMessage(true))) { diff --git a/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/iSchedulerReport/Manager.cshtml b/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/iSchedulerReport/Manager.cshtml index 3eb8851..aa55fa5 100644 --- a/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/iSchedulerReport/Manager.cshtml +++ b/Vrh.Web.Reporting/Areas/iSchedulerReport/Views/iSchedulerReport/Manager.cshtml @@ -5,6 +5,7 @@ *@ @using VRH.Log4Pro.MultiLanguageManager @using Vrh.Web.Common.Lib +@using VRH.Log4Pro.WebTools; @using Vrh.Web.iScheduler.Report.Areas.iSchedulerReport.Controllers @model ManagerViewModel diff --git a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj index 812fc70..254a55a 100644 --- a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj +++ b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj @@ -290,8 +290,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\VRH.Log4Pro.WebTools.1.14.0\lib\net451\VRH.Log4Pro.WebTools.dll + + ..\packages\VRH.Log4Pro.WebTools.1.15.0\lib\net451\VRH.Log4Pro.WebTools.dll ..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll @@ -299,20 +299,20 @@ ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\Vrh.Web.FileManager.1.7.0\lib\net462\Vrh.Web.FileManager.Lib.dll - - ..\packages\Vrh.Web.Menu.1.29.0\lib\net451\Vrh.Web.Menu.Lib.dll + + ..\packages\Vrh.Web.Menu.1.29.1\lib\net451\Vrh.Web.Menu.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.WebForm.2.9.0\lib\net462\Vrh.WebForm.Lib.dll + + ..\packages\Vrh.WebForm.2.10.0\lib\net462\Vrh.WebForm.Lib.dll ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll @@ -667,6 +667,14 @@ + + + + + + + + @@ -685,14 +693,6 @@ - - - - - - - - @@ -888,9 +888,11 @@ + + Always @@ -898,7 +900,6 @@ - @@ -1159,7 +1160,6 @@ - diff --git a/Vrh.Web.Reporting/packages.config b/Vrh.Web.Reporting/packages.config index a3da1c0..aab349a 100644 --- a/Vrh.Web.Reporting/packages.config +++ b/Vrh.Web.Reporting/packages.config @@ -104,14 +104,14 @@ - + - + - + - + diff --git a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj index 66386a5..7df286a 100644 --- a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj +++ b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj @@ -262,8 +262,8 @@ ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll diff --git a/Vrh.Web.iScheduler.Lib/packages.config b/Vrh.Web.iScheduler.Lib/packages.config index bb724d4..01a0307 100644 --- a/Vrh.Web.iScheduler.Lib/packages.config +++ b/Vrh.Web.iScheduler.Lib/packages.config @@ -60,7 +60,7 @@ - + diff --git a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj index e045928..beb4bb6 100644 --- a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj +++ b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj @@ -116,8 +116,8 @@ ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll diff --git a/Vrh.Web.iScheduler.Report.Lib/packages.config b/Vrh.Web.iScheduler.Report.Lib/packages.config index 20484af..fb4cb7f 100644 --- a/Vrh.Web.iScheduler.Report.Lib/packages.config +++ b/Vrh.Web.iScheduler.Report.Lib/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file -- libgit2 0.21.2