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

Merge branch 'ovh' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-11 11:52:57 +01:00
parent 15c3b252e0 b92459b32f
commit 7fe83047c9
24 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INTERFACE/WebLCP/Content/bootstrap-grid.css
Vendored
+1 -3
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Grid v4.5.1 (https://getbootstrap.com/)
* Bootstrap Grid v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -55,8 +55,6 @@ html {
.row {
display: -ms-flexbox;
display: flex;
-ms-flex: 1 0 100%;
flex: 1 0 100%;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -15px;
INTERFACE/WebLCP/Content/bootstrap-grid.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap-grid.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap-grid.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap-reboot.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.5.1 (https://getbootstrap.com/)
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
INTERFACE/WebLCP/Content/bootstrap-reboot.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap-reboot.min.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.5.1 (https://getbootstrap.com/)
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
INTERFACE/WebLCP/Content/bootstrap-reboot.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap.css
Vendored
+1 -3
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.5.1 (https://getbootstrap.com/)
* Bootstrap v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -579,8 +579,6 @@ pre code {
.row {
display: -ms-flexbox;
display: flex;
-ms-flex: 1 0 100%;
flex: 1 0 100%;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -15px;
INTERFACE/WebLCP/Content/bootstrap.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Content/bootstrap.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.bundle.js
Vendored
+14 -14
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.5.1 (https://getbootstrap.com/)
* Bootstrap v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
@@ -53,7 +53,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.1): util.js
* Bootstrap (v4.5.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -234,7 +234,7 @@
*/
var NAME = 'alert';
var VERSION = '4.5.1';
var VERSION = '4.5.2';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@@ -390,7 +390,7 @@
*/
var NAME$1 = 'button';
var VERSION$1 = '4.5.1';
var VERSION$1 = '4.5.2';
var DATA_KEY$1 = 'bs.button';
var EVENT_KEY$1 = "." + DATA_KEY$1;
var DATA_API_KEY$1 = '.data-api';
@@ -583,7 +583,7 @@
*/
var NAME$2 = 'carousel';
var VERSION$2 = '4.5.1';
var VERSION$2 = '4.5.2';
var DATA_KEY$2 = 'bs.carousel';
var EVENT_KEY$2 = "." + DATA_KEY$2;
var DATA_API_KEY$2 = '.data-api';
@@ -1170,7 +1170,7 @@
*/
var NAME$3 = 'collapse';
var VERSION$3 = '4.5.1';
var VERSION$3 = '4.5.2';
var DATA_KEY$3 = 'bs.collapse';
var EVENT_KEY$3 = "." + DATA_KEY$3;
var DATA_API_KEY$3 = '.data-api';
@@ -4133,7 +4133,7 @@
*/
var NAME$4 = 'dropdown';
var VERSION$4 = '4.5.1';
var VERSION$4 = '4.5.2';
var DATA_KEY$4 = 'bs.dropdown';
var EVENT_KEY$4 = "." + DATA_KEY$4;
var DATA_API_KEY$4 = '.data-api';
@@ -4647,7 +4647,7 @@
*/
var NAME$5 = 'modal';
var VERSION$5 = '4.5.1';
var VERSION$5 = '4.5.2';
var DATA_KEY$5 = 'bs.modal';
var EVENT_KEY$5 = "." + DATA_KEY$5;
var DATA_API_KEY$5 = '.data-api';
@@ -5257,7 +5257,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.1): tools/sanitizer.js
* Bootstrap (v4.5.2): tools/sanitizer.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5383,7 +5383,7 @@
*/
var NAME$6 = 'tooltip';
var VERSION$6 = '4.5.1';
var VERSION$6 = '4.5.2';
var DATA_KEY$6 = 'bs.tooltip';
var EVENT_KEY$6 = "." + DATA_KEY$6;
var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
@@ -6095,7 +6095,7 @@
*/
var NAME$7 = 'popover';
var VERSION$7 = '4.5.1';
var VERSION$7 = '4.5.2';
var DATA_KEY$7 = 'bs.popover';
var EVENT_KEY$7 = "." + DATA_KEY$7;
var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
@@ -6275,7 +6275,7 @@
*/
var NAME$8 = 'scrollspy';
var VERSION$8 = '4.5.1';
var VERSION$8 = '4.5.2';
var DATA_KEY$8 = 'bs.scrollspy';
var EVENT_KEY$8 = "." + DATA_KEY$8;
var DATA_API_KEY$6 = '.data-api';
@@ -6567,7 +6567,7 @@
*/
var NAME$9 = 'tab';
var VERSION$9 = '4.5.1';
var VERSION$9 = '4.5.2';
var DATA_KEY$9 = 'bs.tab';
var EVENT_KEY$9 = "." + DATA_KEY$9;
var DATA_API_KEY$7 = '.data-api';
@@ -6793,7 +6793,7 @@
*/
var NAME$a = 'toast';
var VERSION$a = '4.5.1';
var VERSION$a = '4.5.2';
var DATA_KEY$a = 'bs.toast';
var EVENT_KEY$a = "." + DATA_KEY$a;
var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
INTERFACE/WebLCP/Scripts/bootstrap.bundle.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.bundle.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.bundle.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.js
Vendored
+14 -14
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.5.1 (https://getbootstrap.com/)
* Bootstrap v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
@@ -54,7 +54,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.1): util.js
* Bootstrap (v4.5.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -235,7 +235,7 @@
*/
var NAME = 'alert';
var VERSION = '4.5.1';
var VERSION = '4.5.2';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
@@ -391,7 +391,7 @@
*/
var NAME$1 = 'button';
var VERSION$1 = '4.5.1';
var VERSION$1 = '4.5.2';
var DATA_KEY$1 = 'bs.button';
var EVENT_KEY$1 = "." + DATA_KEY$1;
var DATA_API_KEY$1 = '.data-api';
@@ -584,7 +584,7 @@
*/
var NAME$2 = 'carousel';
var VERSION$2 = '4.5.1';
var VERSION$2 = '4.5.2';
var DATA_KEY$2 = 'bs.carousel';
var EVENT_KEY$2 = "." + DATA_KEY$2;
var DATA_API_KEY$2 = '.data-api';
@@ -1171,7 +1171,7 @@
*/
var NAME$3 = 'collapse';
var VERSION$3 = '4.5.1';
var VERSION$3 = '4.5.2';
var DATA_KEY$3 = 'bs.collapse';
var EVENT_KEY$3 = "." + DATA_KEY$3;
var DATA_API_KEY$3 = '.data-api';
@@ -1520,7 +1520,7 @@
*/
var NAME$4 = 'dropdown';
var VERSION$4 = '4.5.1';
var VERSION$4 = '4.5.2';
var DATA_KEY$4 = 'bs.dropdown';
var EVENT_KEY$4 = "." + DATA_KEY$4;
var DATA_API_KEY$4 = '.data-api';
@@ -2034,7 +2034,7 @@
*/
var NAME$5 = 'modal';
var VERSION$5 = '4.5.1';
var VERSION$5 = '4.5.2';
var DATA_KEY$5 = 'bs.modal';
var EVENT_KEY$5 = "." + DATA_KEY$5;
var DATA_API_KEY$5 = '.data-api';
@@ -2644,7 +2644,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.1): tools/sanitizer.js
* Bootstrap (v4.5.2): tools/sanitizer.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -2770,7 +2770,7 @@
*/
var NAME$6 = 'tooltip';
var VERSION$6 = '4.5.1';
var VERSION$6 = '4.5.2';
var DATA_KEY$6 = 'bs.tooltip';
var EVENT_KEY$6 = "." + DATA_KEY$6;
var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
@@ -3482,7 +3482,7 @@
*/
var NAME$7 = 'popover';
var VERSION$7 = '4.5.1';
var VERSION$7 = '4.5.2';
var DATA_KEY$7 = 'bs.popover';
var EVENT_KEY$7 = "." + DATA_KEY$7;
var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
@@ -3662,7 +3662,7 @@
*/
var NAME$8 = 'scrollspy';
var VERSION$8 = '4.5.1';
var VERSION$8 = '4.5.2';
var DATA_KEY$8 = 'bs.scrollspy';
var EVENT_KEY$8 = "." + DATA_KEY$8;
var DATA_API_KEY$6 = '.data-api';
@@ -3954,7 +3954,7 @@
*/
var NAME$9 = 'tab';
var VERSION$9 = '4.5.1';
var VERSION$9 = '4.5.2';
var DATA_KEY$9 = 'bs.tab';
var EVENT_KEY$9 = "." + DATA_KEY$9;
var DATA_API_KEY$7 = '.data-api';
@@ -4180,7 +4180,7 @@
*/
var NAME$a = 'toast';
var VERSION$a = '4.5.1';
var VERSION$a = '4.5.2';
var DATA_KEY$a = 'bs.toast';
var EVENT_KEY$a = "." + DATA_KEY$a;
var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
INTERFACE/WebLCP/Scripts/bootstrap.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Scripts/bootstrap.min.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
INTERFACE/WebLCP/Web.config
+1 -2
View File
@@ -84,8 +84,7 @@
</appSettings>
<connectionStrings>
<add name="AdmodellingConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Admodelling;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC"
providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
INTERFACE/WebLCP/WebLCP.csproj
+9 -3
View File
@@ -127,8 +127,11 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.0.2011.746, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2011.746\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -270,6 +273,7 @@
</Content>
<Content Include="JobsList.aspx" />
<Content Include="jumper.aspx" />
<Content Include="libzstd.dll" />
<Content Include="login.aspx" />
<Content Include="MethodSpecs.aspx" />
<Content Include="mongocrypt.dll" />
@@ -315,11 +319,11 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<None Include="Properties\PublishProfiles\OVH.pubxml" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
<Content Include="Scripts\bootstrap.bundle.js.map" />
<None Include="Properties\PublishProfiles\OVH.pubxml" />
<None Include="Scripts\jquery-3.5.1.intellisense.js" />
<Content Include="Scripts\jquery-3.5.1.js" />
<Content Include="Scripts\jquery-3.5.1.min.js" />
@@ -418,6 +422,8 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="showLog.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="WIP.aspx" />
<Content Include="WUC\cmp_footer.ascx" />
<Content Include="WUC\cmp_header.ascx" />
INTERFACE/WebLCP/packages.config
+3 -2
View File
@@ -5,7 +5,7 @@
<package id="Antlr" version="3.5.0.2" targetFramework="net462" />
<package id="AspNet.ScriptManager.bootstrap" version="4.5.2" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.5.1" targetFramework="net462" />
<package id="bootstrap" version="4.5.1" targetFramework="net462" />
<package id="bootstrap" version="4.5.2" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.3.2" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
@@ -39,7 +39,8 @@
<package id="SharpZipLib" version="1.3.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="5.0.2010.745" targetFramework="net462" />
<package id="SteamWare" version="5.0.2011.746" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="5.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
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=91']) {
withEnv(['NEXT_BUILD_NUMBER=92']) {
// 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.APP_NAME = 'LCP'