diff --git a/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache
new file mode 100644
index 0000000..44ab5d7
Binary files /dev/null and b/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/CMS_SC/App_Start/BundleConfig.cs b/CMS_SC/App_Start/BundleConfig.cs
index b41eb4f..b35214d 100644
--- a/CMS_SC/App_Start/BundleConfig.cs
+++ b/CMS_SC/App_Start/BundleConfig.cs
@@ -33,10 +33,10 @@ namespace CMS_SC
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
+
bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include(
"~/Scripts/jSteamware*"));
-
//bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
// "~/Scripts/jquery.unobtrusive*",
// "~/Scripts/jquery.validate*"));
diff --git a/CMS_SC/BootstrapNoUpdPnl.Master.cs b/CMS_SC/BootstrapNoUpdPnl.Master.cs
index b2b411b..de52fae 100644
--- a/CMS_SC/BootstrapNoUpdPnl.Master.cs
+++ b/CMS_SC/BootstrapNoUpdPnl.Master.cs
@@ -3,43 +3,53 @@ using System.Web.UI;
namespace CMS_SC
{
- public partial class BootstrapNoUpdPnl : System.Web.UI.MasterPage
+ public partial class BootstrapNoUpdPnl : System.Web.UI.MasterPage
+ {
+ protected void Page_Load(object sender, EventArgs e)
{
- protected void Page_Load(object sender, EventArgs e)
- {
- if (!Page.IsPostBack)
- {
- setTimer();
- updateLabels();
- }
- }
- ///
- /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
- ///
- private void setTimer()
- {
- Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
- }
- protected void Timer1_Tick(object sender, EventArgs e)
- {
- updateLabels();
- }
- private void updateLabels()
- {
- }
- ///
- /// determina visibilità controllo ricerca
- ///
- public bool showSearch
- {
- get
- {
- return mod_testata.pageHasSearch;
- }
- set
- {
- mod_testata.pageHasSearch = value;
- }
- }
+ if (!Page.IsPostBack)
+ {
+ setTimer();
+ updateLabels();
+ }
}
+ ///
+ /// Versione corrente sw
+ ///
+ public Version currVersion
+ {
+ get
+ {
+ return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+ }
+ }
+ ///
+ /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
+ ///
+ private void setTimer()
+ {
+ Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
+ }
+ protected void Timer1_Tick(object sender, EventArgs e)
+ {
+ updateLabels();
+ }
+ private void updateLabels()
+ {
+ }
+ ///
+ /// determina visibilità controllo ricerca
+ ///
+ public bool showSearch
+ {
+ get
+ {
+ return mod_testata.pageHasSearch;
+ }
+ set
+ {
+ mod_testata.pageHasSearch = value;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/CMS_SC/Bundle.config b/CMS_SC/Bundle.config
index 2845c6e..25728e6 100644
--- a/CMS_SC/Bundle.config
+++ b/CMS_SC/Bundle.config
@@ -28,19 +28,5 @@
-
-
diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj
index cdb588b..ebfc6c8 100644
--- a/CMS_SC/CMS_SC.csproj
+++ b/CMS_SC/CMS_SC.csproj
@@ -125,7 +125,7 @@
..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.4.12\lib\net45\NLog.dll
+ ..\packages\NLog.4.4.13\lib\net45\NLog.dll..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll
@@ -319,19 +319,19 @@
-
- Always
-
+
+
+ Always
+ Designer
- Designer
diff --git a/CMS_SC/NLog.xsd b/CMS_SC/NLog.xsd
index 4740d80..6b26042 100644
--- a/CMS_SC/NLog.xsd
+++ b/CMS_SC/NLog.xsd
@@ -164,7 +164,6 @@
-
@@ -1136,19 +1135,18 @@
-
+
-
-
+
@@ -1156,6 +1154,7 @@
+
@@ -1247,11 +1246,6 @@
Value indicationg whether file creation calls should be synchronized by a system global mutex.
-
-
- Maximum number of log filenames that should be stored as existing.
-
- Indicates whether the footer should be written only when the file is archived.
@@ -1277,6 +1271,11 @@
Indicates whether to create directories if they do not exist.
+
+
+ Indicates whether to enable log file(s) to be deleted.
+
+ File attributes (Windows only).
@@ -1292,16 +1291,6 @@
Indicates whether to replace file contents on each write instead of appending log message at the end.
-
-
- Indicates whether to enable log file(s) to be deleted.
-
-
-
-
- Number of times the write is appended on the file before NLog discards the log message.
-
- Indicates whether concurrent writes to the log file by multiple processes on the same host.
@@ -1312,6 +1301,11 @@
Indicates whether to keep log file open instead of opening and closing it on each logging event.
+
+
+ Maximum number of log filenames that should be stored as existing.
+
+ Indicates whether concurrent writes to the log file by multiple processes on different network hosts.
@@ -1347,6 +1341,11 @@
Delay in milliseconds to wait before attempting to write to the file again.
+
+
+ Number of times the write is appended on the file before NLog discards the log message.
+
+
@@ -2518,10 +2517,8 @@
-
-
@@ -2567,11 +2564,6 @@
Web service namespace. Only used with Soap.
-
-
- Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in parameters)
-
- Protocol to be used when calling web service.
@@ -3004,74 +2996,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Action to be taken when filter matches.
-
-
-
-
- Layout to be used to filter log messages.
-
-
-
-
- Default number of unique filter values to expect, will automatically increase if needed
-
-
-
-
- Append FilterCount to the when an event is no longer filtered
-
-
-
-
- Insert FilterCount value into when an event is no longer filtered
-
-
-
-
- Max number of unique filter values to expect simultaneously
-
-
-
-
- Max length of filter values, will truncate if above limit
-
-
-
-
- Default buffer size for the internal buffers
-
-
-
-
- Reuse internal buffers, and doesn't have to constantly allocate new buffers
-
-
-
-
- How long before a filter expires, and logging is accepted again
-
-
-
-
-
diff --git a/CMS_SC/Test.aspx b/CMS_SC/Test.aspx
index 6e1dada..ab7d262 100644
--- a/CMS_SC/Test.aspx
+++ b/CMS_SC/Test.aspx
@@ -9,4 +9,13 @@
+
+ ...more info
+
+ Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
+