diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 424e4eb..9f92d30 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index a0f9eda..01d728b 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -163,7 +163,7 @@ - + @@ -171,7 +171,7 @@ - + diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 7ef590e..7faeba7 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/WebSCR.sln b/WebSCR.sln index f84cf68..f9178a8 100644 --- a/WebSCR.sln +++ b/WebSCR.sln @@ -1,9 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.6 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSCR", "WebSCR\WebSCR.csproj", "{3753524E-FD74-4896-A4EB-EEE1406F94CF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\SteamWareLibrary\SteamWare\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\..\VisualStudioProject\Steamware\SteamWareLib\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{88774E43-68A1-4E52-B692-493FEE0BA5C2}" EndProject @@ -57,34 +59,34 @@ Global {3753524E-FD74-4896-A4EB-EEE1406F94CF}.Steamware|Any CPU.Build.0 = Release|Any CPU {3753524E-FD74-4896-A4EB-EEE1406F94CF}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU {3753524E-FD74-4896-A4EB-EEE1406F94CF}.WinLab|Any CPU.Build.0 = WinLab|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = 218_SP|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = 218_SP|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = 218_test|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = 218_test|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Alumat|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Alumat|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = AlumatTest|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = AlumatTest|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = DEMO|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = DEMO|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = deploy|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = deploy|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = ETS-218|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = ETS-218|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = IIS02|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = Debug|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = IIS01_SP|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Steamware|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Steamware|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = WinLab|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = IIS01_SP|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = IIS01_SP|Any CPU {88774E43-68A1-4E52-B692-493FEE0BA5C2}.218_SP|Any CPU.ActiveCfg = Release|Any CPU {88774E43-68A1-4E52-B692-493FEE0BA5C2}.218_SP|Any CPU.Build.0 = Release|Any CPU {88774E43-68A1-4E52-B692-493FEE0BA5C2}.218_test|Any CPU.ActiveCfg = Release|Any CPU diff --git a/WebSCR/JQMob.Master b/WebSCR/JQMob.Master index c20d43e..e05d8c7 100644 --- a/WebSCR/JQMob.Master +++ b/WebSCR/JQMob.Master @@ -3,11 +3,7 @@ <%@ Register Src="~/WebUserControls/mod_footer.ascx" TagPrefix="uc1" TagName="mod_footer" %> <%@ Register Src="~/WebUserControls/mod_header.ascx" TagPrefix="uc2" TagName="mod_header" %> - - - - @@ -37,20 +33,6 @@
<%--aggiunto 2014.10.15 x inserire report inline...--%> - <%-- - - - - - - - - - - - - - --%>
diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 83dd4d1..b69a4e2 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -1,64 +1,64 @@ - + -
-
-
-
+
+
+
+
- - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - + + - + - + - + - + - + - - - + + + + + + + + + + + + + - + - - - - + + + + - - - + + + @@ -134,12 +163,12 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - + + - + - + - + - + - + - - - + + + + + + + + + + + + + - + - - - - + + + + - - - + + + @@ -134,12 +163,12 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - +