Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SDK'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-14 09:36:43 +02:00
parent ba8fce55d7 7fa5d94f39
commit b095f05693
7 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=329']) {
withEnv(['NEXT_BUILD_NUMBER=330']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/NKC_WF.csproj
+6 -2
View File
@@ -292,8 +292,12 @@
<Content Include="export\BunkDetail.aspx" />
<Content Include="Home.aspx" />
<Content Include="Images\999999999.svg" />
<Content Include="Images\LogoEgaltech.png" />
<Content Include="Images\LogoSteamware.png" />
<Content Include="Images\LogoEgaltech.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\LogoSteamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\test.svg" />
<Content Include="mongocrypt.dll" />
<Content Include="PartsImg\118145.png">
NKC_WF/Web.config
+2 -1
View File
@@ -36,7 +36,8 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<!--Nascondo gli erroracci-->
<customErrors mode="On" defaultRedirect="~/site/Default"/>
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
<customErrors mode="On" defaultRedirect="~/"/>
<!--Mostro gli erroracci-->
<!--<customErrors mode="Off"/>-->
</system.web>
NKC_WF/site/Contact.aspx
+13 -8
View File
@@ -10,30 +10,35 @@
</div>
<div class="card-body">
<div class="row">
<div class="col-12 col-md-6">
<div class="col-12 col-md-4">
<asp:Image runat="server" CssClass="img-fluid" Height="64" ImageUrl="~/Images/LogoEgaltech.png" />
<address>
<b>Egaltech srl</b><br />
<hr />
Via Cremasca 24<br />
24052 Azzano San Paolo<br />
Bergamo – Italy<br />
<abbr title="Phone"><i class="fa fa-phone" aria-hidden="true"></i></abbr>+39035 0444806
<abbr title="Phone"><i class="fa fa-phone" aria-hidden="true"></i></abbr>
+39 035-0444806
</address>
<address>
<strong>Support:</strong> <a href="mailto:info@egaltech.com">info@egaltech.com</a>
<i class="fa fa-envelope-o" aria-hidden="true"></i> <a href="mailto:info@egaltech.com">info@egaltech.com</a>
</address>
</div>
<div class="col-12 col-md-6 text-right">
<div class="col-md-4"></div>
<div class="col-12 col-md-4 text-right">
<asp:Image runat="server" CssClass="img-fluid" Height="64" ImageUrl="~/Images/LogoSteamware.png" />
<address>
<b>Steamware srl</b><br />
via Briolo Fuori, 27<br />
24015 San Giovanni Bianco<br />
<hr />
via Nazionale 93<br />
24068 Seriate<br />
Bergamo – Italy<br />
<abbr title="Phone"><i class="fa fa-phone" aria-hidden="true"></i></abbr>+39 035-460560
<abbr title="Phone"><i class="fa fa-phone" aria-hidden="true"></i></abbr>
+39 035-460560
</address>
<address>
<strong>Support:</strong> <a href="mailto:info@steamware.net">info@steamware.net</a>
<i class="fa fa-envelope-o" aria-hidden="true"></i> <a href="mailto:info@steamware.net">info@steamware.net</a>
</address>
</div>
</div>
NKC_WF/site/Default.aspx.cs
+3
View File
@@ -7,6 +7,9 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
// resetto sessione utente
Session.Clear();
// vado a login
Response.Redirect("Login");
}
/// <summary>
NKC_WF/site/UpdMan.aspx
+10
View File
@@ -45,6 +45,16 @@
</div>
</div>
</div>
<div class="col-4 col-md-3">
<div class="card">
<div class="card-header">
<h2 class="text-center">LPA <i class="fa fa-download"></i></h2>
</div>
<div class="card-body">
<asp:HyperLink runat="server" ID="hlLPA" class="btn btn-info text-light btn-lg btn-block" Target="_blank" NavigateUrl="http://nexus.steamware.net/repository/utility/LPA/LPA/stable/LPA-stable.zip" OnClientClick='<%: SteamWare.jsUtils.getCBE("DownloadConfirm")%>'><strong>STABLE</strong></asp:HyperLink>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12 text-center">
NKC_WF/site/UpdMan.aspx.designer.cs
Generated
+9
View File
@@ -41,6 +41,15 @@ namespace NKC_WF.site
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtDownloadZCode;
/// <summary>
/// Controllo hlLPA.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlLPA;
/// <summary>
/// Controllo UpdateProgressDisplay.
/// </summary>