From 7b153403ecc69f3f34a9cbbbd6b696bd956bf6fa Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 16 Mar 2021 16:48:27 +0100 Subject: [PATCH] refresh version --- .../WebMasterPages/AjaxSimpleFull.Master | 10 +++++----- GPW_Commesse/WebUserControls/cmp_chart.ascx | 17 +++++++++-------- Jenkinsfile | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master index a1ab0fa..d77cc95 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master @@ -59,7 +59,7 @@
- +
@@ -71,9 +71,9 @@
<%-- --%> - - - <%-- + + + <%-- --%>
@@ -85,4 +85,4 @@
- + \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/cmp_chart.ascx b/GPW_Commesse/WebUserControls/cmp_chart.ascx index d080feb..fda1ee2 100644 --- a/GPW_Commesse/WebUserControls/cmp_chart.ascx +++ b/GPW_Commesse/WebUserControls/cmp_chart.ascx @@ -150,13 +150,14 @@ function pageLoad() { //redrawAll(); } -
-
Periodo
+
+ Periodo +
@@ -167,10 +168,10 @@
-
- -
-
- -
+
+ +
+
+ +
\ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 6782b8f..394739a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4148']) { + withEnv(['NEXT_BUILD_NUMBER=4149']) { // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW'