Merge branch 'develop'
This commit is contained in:
@@ -216,6 +216,8 @@ namespace GPW_Commesse.WebUserControls
|
||||
// update
|
||||
mod_commAttivitaDesk1.doUpdate();
|
||||
grView.DataBind();
|
||||
|
||||
upMain.Update();
|
||||
}
|
||||
|
||||
private void mod_TagCloudProgetti1_eh_newVal(object sender, EventArgs e)
|
||||
@@ -339,7 +341,7 @@ namespace GPW_Commesse.WebUserControls
|
||||
break;
|
||||
}
|
||||
showPanels();
|
||||
tempVisible = false;
|
||||
tempVisible = true;
|
||||
cmp_chart.dtRif = DateTime.Today;
|
||||
}
|
||||
showCharts(tempVisible);
|
||||
|
||||
Vendored
+1
-1
@@ -10,7 +10,7 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=4156']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=4157']) {
|
||||
// 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'
|
||||
|
||||
Reference in New Issue
Block a user