aggiunta js rif

This commit is contained in:
Samuele E. Locatelli
2018-06-08 09:59:08 +02:00
parent 3a69e47d9c
commit 8bb6445f41
3 changed files with 10 additions and 4 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=773']) {
withEnv(['NEXT_BUILD_NUMBER=774']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+4 -1
View File
@@ -12,7 +12,10 @@
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
<link href="~/Content/vis.min.css" rel="stylesheet" />
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
<script src="scripts/vis.min.js" type="text/javascript"></script>
<script src="scripts/vis.min.js" type="text/javascript"></script>
<script src="scripts/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="scripts/jintervals.js" type="text/javascript"></script>
<script src="scripts/jquery.stopwatch.js" type="text/javascript"></script>
<asp:PlaceHolder runat="server">
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
+5 -2
View File
@@ -11,8 +11,11 @@
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
<link href="~/Content/vis.min.css" rel="stylesheet" />
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
<script src="scripts/vis.min.js" type="text/javascript"></script>
<%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
<script src="scripts/vis.min.js" type="text/javascript"></script>
<script src="scripts/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="scripts/jintervals.js" type="text/javascript"></script>
<script src="scripts/jquery.stopwatch.js" type="text/javascript"></script>
<%--<script type="text/jscript" src="../vis/vis.js"></script>
<link href="../vis/vis.css" rel="stylesheet" />--%>