Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh links js/css/master

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-08 09:56:00 +02:00
parent c2f6b82eec
commit 3a69e47d9c
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=770']) {
withEnv(['NEXT_BUILD_NUMBER=773']) {
// 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'
MP-Site/vis/vis.min.css → MP-Site/Content/vis.min.css
Vendored
View File
MP-Site/MP-Site.csproj
+2 -2
View File
@@ -802,8 +802,8 @@
<Content Include="vis\vis-timeline-graph2d.min.js" />
<Content Include="vis\vis.css" />
<Content Include="vis\vis.js" />
<Content Include="vis\vis.min.css" />
<Content Include="vis\vis.min.js" />
<Content Include="Content\vis.min.css" />
<Content Include="scripts\vis.min.js" />
<Content Include="WebUserControls\mod_andamentoStorico.ascx" />
<Content Include="WebUserControls\mod_AnPro_DettArt.ascx" />
<Content Include="WebUserControls\mod_AnPro_DettGg.ascx" />
MP-Site/WebMasterPages/MAPO_refresh.master
+4 -2
View File
@@ -8,9 +8,11 @@
<head runat="server">
<title>MoonPro - MOnitor ONline della PROduzione</title>
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
<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>--%>
<link href="~/vis/vis.css" rel="stylesheet" />
<script src="scripts/vis.min.js" type="text/javascript"></script>
<asp:PlaceHolder runat="server">
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
MP-Site/WebMasterPages/MAPO_refresh30.master
+5 -2
View File
@@ -10,8 +10,11 @@
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
<script type="text/jscript" src="../vis/vis.js"></script>
<link href="../vis/vis.css" 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>
<link href="../vis/vis.css" rel="stylesheet" />--%>
<asp:PlaceHolder runat="server">
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
MP-Site/vis/vis.min.js → MP-Site/scripts/vis.min.js
Vendored
View File