From 1b168501afa26d79c3c27f5e0fae967ef523e465 Mon Sep 17 00:00:00 2001 From: odain Date: Fri, 29 Nov 2019 16:37:01 +0100 Subject: [PATCH 01/10] add a parameter to Jenkins pipeline --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 94ac751e6..a7b813418 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,8 @@ pipeline { agent any + parameters { + string(name: 'RUN_NON_REG_TESTS', defaultValue: '0', description: 'Do You want to run legacy OQL regression tests?') + } stages { stage('init') { @@ -36,7 +39,7 @@ pipeline { parallel { stage('phpunit') { steps { - sh './.jenkins/bin/tests/phpunit.sh' + sh './.jenkins/bin/tests/phpunit.sh ${params.RUN_NON_REG_TESTS}' } } } From 50dddaaa9b9585be04e7bddc22be319057666d74 Mon Sep 17 00:00:00 2001 From: odain Date: Fri, 29 Nov 2019 16:46:59 +0100 Subject: [PATCH 02/10] add debug mode as param + use params in phpunit.sh --- .jenkins/bin/tests/phpunit.sh | 15 +++++++++++++-- Jenkinsfile | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.jenkins/bin/tests/phpunit.sh b/.jenkins/bin/tests/phpunit.sh index 3c327f6c9..ce3543f4b 100755 --- a/.jenkins/bin/tests/phpunit.sh +++ b/.jenkins/bin/tests/phpunit.sh @@ -3,6 +3,17 @@ set -x cd test -export DEBUG_UNIT_TEST="0" +export DEBUG_UNIT_TEST=0 +RUN_NONREG_TESTS=0 -php vendor/bin/phpunit --log-junit ../var/test/phpunit-log.junit.xml --teamcity \ No newline at end of file +if [ $# -ge 1 ] +then + export DEBUG_UNIT_TEST=$1 +fi + +if [ $# -ge 2 ] +then + RUN_NONREG_TESTS=$2 +fi + +#php vendor/bin/phpunit --log-junit ../var/test/phpunit-log.junit.xml --teamcity \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a7b813418..e736d5aab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,7 @@ pipeline { agent any parameters { + string(name: 'DEBUG_UNIT_TEST', defaultValue: '0', description: 'Debug mode?') string(name: 'RUN_NON_REG_TESTS', defaultValue: '0', description: 'Do You want to run legacy OQL regression tests?') } stages { @@ -39,7 +40,7 @@ pipeline { parallel { stage('phpunit') { steps { - sh './.jenkins/bin/tests/phpunit.sh ${params.RUN_NON_REG_TESTS}' + sh './.jenkins/bin/tests/phpunit.sh ${params.DEBUG_UNIT_TEST} ${params.RUN_NON_REG_TESTS}' } } } From d2d203df34ab685086fcaebaaea8873c539e77cd Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 29 Nov 2019 17:37:59 +0100 Subject: [PATCH 03/10] :lipstick: Increase blur effect on portal modal backdrop --- .../public/css/bootstrap-theme-combodo.css | 344 +++++++++--------- .../public/css/bootstrap-theme-combodo.scss | 22 +- 2 files changed, 195 insertions(+), 171 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css index 78ad943cf..b5df190bf 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css +++ b/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css @@ -1,19 +1,25 @@ +/* + * Copyright (C) 2013-2019 Combodo SARL + * + * This file is part of iTop. + * + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * iTop is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + */ + /*! * Combodo portal theme v2.7.0 * Based on Bootswatch Simplex */ -/*! - * bootswatch v3.3.5 - * Homepage: http://bootswatch.com - * Copyright 2012-2015 Thomas Park - * Licensed under MIT - * Based on Bootstrap - */ -/*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -31,7 +37,7 @@ html { body { font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; - line-height: 1.42857; + line-height: 1.428571429; color: #777; background-color: #edecec; } @@ -69,7 +75,7 @@ img { } .img-thumbnail { padding: 4px; - line-height: 1.42857; + line-height: 1.428571429; background-color: #fcfcfc; border: 1px solid #ddd; border-radius: 0px; @@ -293,7 +299,7 @@ dl { margin-bottom: 18px; } dt, dd { - line-height: 1.42857; + line-height: 1.428571429; } dt { font-weight: bold; @@ -335,7 +341,7 @@ blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child { blockquote footer, blockquote small, blockquote .small { display: block; font-size: 80%; - line-height: 1.42857; + line-height: 1.428571429; color: #808080; } blockquote footer:before, blockquote small:before, blockquote .small:before { @@ -357,7 +363,7 @@ blockquote footer:before, blockquote small:before, blockquote .small:before { address { margin-bottom: 18px; font-style: normal; - line-height: 1.42857; + line-height: 1.428571429; } code, kbd, pre, samp { font-family: Menlo, Monaco, Consolas, "Courier New", monospace; @@ -390,7 +396,7 @@ pre { padding: 8.5px; margin: 0 0 9px; font-size: 12px; - line-height: 1.42857; + line-height: 1.428571429; word-break: break-all; word-wrap: break-word; color: #444; @@ -454,73 +460,73 @@ pre code { width: 100%; } .col-xs-11 { - width: 91.66667%; + width: 91.66666667%; } .col-xs-10 { - width: 83.33333%; + width: 83.33333333%; } .col-xs-9 { width: 75%; } .col-xs-8 { - width: 66.66667%; + width: 66.66666667%; } .col-xs-7 { - width: 58.33333%; + width: 58.33333333%; } .col-xs-6 { width: 50%; } .col-xs-5 { - width: 41.66667%; + width: 41.66666667%; } .col-xs-4 { - width: 33.33333%; + width: 33.33333333%; } .col-xs-3 { width: 25%; } .col-xs-2 { - width: 16.66667%; + width: 16.66666667%; } .col-xs-1 { - width: 8.33333%; + width: 8.33333333%; } .col-xs-pull-12 { right: 100%; } .col-xs-pull-11 { - right: 91.66667%; + right: 91.66666667%; } .col-xs-pull-10 { - right: 83.33333%; + right: 83.33333333%; } .col-xs-pull-9 { right: 75%; } .col-xs-pull-8 { - right: 66.66667%; + right: 66.66666667%; } .col-xs-pull-7 { - right: 58.33333%; + right: 58.33333333%; } .col-xs-pull-6 { right: 50%; } .col-xs-pull-5 { - right: 41.66667%; + right: 41.66666667%; } .col-xs-pull-4 { - right: 33.33333%; + right: 33.33333333%; } .col-xs-pull-3 { right: 25%; } .col-xs-pull-2 { - right: 16.66667%; + right: 16.66666667%; } .col-xs-pull-1 { - right: 8.33333%; + right: 8.33333333%; } .col-xs-pull-0 { right: auto; @@ -529,37 +535,37 @@ pre code { left: 100%; } .col-xs-push-11 { - left: 91.66667%; + left: 91.66666667%; } .col-xs-push-10 { - left: 83.33333%; + left: 83.33333333%; } .col-xs-push-9 { left: 75%; } .col-xs-push-8 { - left: 66.66667%; + left: 66.66666667%; } .col-xs-push-7 { - left: 58.33333%; + left: 58.33333333%; } .col-xs-push-6 { left: 50%; } .col-xs-push-5 { - left: 41.66667%; + left: 41.66666667%; } .col-xs-push-4 { - left: 33.33333%; + left: 33.33333333%; } .col-xs-push-3 { left: 25%; } .col-xs-push-2 { - left: 16.66667%; + left: 16.66666667%; } .col-xs-push-1 { - left: 8.33333%; + left: 8.33333333%; } .col-xs-push-0 { left: auto; @@ -568,37 +574,37 @@ pre code { margin-left: 100%; } .col-xs-offset-11 { - margin-left: 91.66667%; + margin-left: 91.66666667%; } .col-xs-offset-10 { - margin-left: 83.33333%; + margin-left: 83.33333333%; } .col-xs-offset-9 { margin-left: 75%; } .col-xs-offset-8 { - margin-left: 66.66667%; + margin-left: 66.66666667%; } .col-xs-offset-7 { - margin-left: 58.33333%; + margin-left: 58.33333333%; } .col-xs-offset-6 { margin-left: 50%; } .col-xs-offset-5 { - margin-left: 41.66667%; + margin-left: 41.66666667%; } .col-xs-offset-4 { - margin-left: 33.33333%; + margin-left: 33.33333333%; } .col-xs-offset-3 { margin-left: 25%; } .col-xs-offset-2 { - margin-left: 16.66667%; + margin-left: 16.66666667%; } .col-xs-offset-1 { - margin-left: 8.33333%; + margin-left: 8.33333333%; } .col-xs-offset-0 { margin-left: 0%; @@ -611,73 +617,73 @@ pre code { width: 100%; } .col-sm-11 { - width: 91.66667%; + width: 91.66666667%; } .col-sm-10 { - width: 83.33333%; + width: 83.33333333%; } .col-sm-9, .form_field_compact .form-group.form_group_small .form_field_control { width: 75%; } .col-sm-8 { - width: 66.66667%; + width: 66.66666667%; } .col-sm-7 { - width: 58.33333%; + width: 58.33333333%; } .col-sm-6 { width: 50%; } .col-sm-5 { - width: 41.66667%; + width: 41.66666667%; } .col-sm-4 { - width: 33.33333%; + width: 33.33333333%; } .col-sm-3, .form_field_compact .form-group.form_group_small .form_field_label { width: 25%; } .col-sm-2 { - width: 16.66667%; + width: 16.66666667%; } .col-sm-1 { - width: 8.33333%; + width: 8.33333333%; } .col-sm-pull-12 { right: 100%; } .col-sm-pull-11 { - right: 91.66667%; + right: 91.66666667%; } .col-sm-pull-10 { - right: 83.33333%; + right: 83.33333333%; } .col-sm-pull-9 { right: 75%; } .col-sm-pull-8 { - right: 66.66667%; + right: 66.66666667%; } .col-sm-pull-7 { - right: 58.33333%; + right: 58.33333333%; } .col-sm-pull-6 { right: 50%; } .col-sm-pull-5 { - right: 41.66667%; + right: 41.66666667%; } .col-sm-pull-4 { - right: 33.33333%; + right: 33.33333333%; } .col-sm-pull-3 { right: 25%; } .col-sm-pull-2 { - right: 16.66667%; + right: 16.66666667%; } .col-sm-pull-1 { - right: 8.33333%; + right: 8.33333333%; } .col-sm-pull-0 { right: auto; @@ -686,37 +692,37 @@ pre code { left: 100%; } .col-sm-push-11 { - left: 91.66667%; + left: 91.66666667%; } .col-sm-push-10 { - left: 83.33333%; + left: 83.33333333%; } .col-sm-push-9 { left: 75%; } .col-sm-push-8 { - left: 66.66667%; + left: 66.66666667%; } .col-sm-push-7 { - left: 58.33333%; + left: 58.33333333%; } .col-sm-push-6 { left: 50%; } .col-sm-push-5 { - left: 41.66667%; + left: 41.66666667%; } .col-sm-push-4 { - left: 33.33333%; + left: 33.33333333%; } .col-sm-push-3 { left: 25%; } .col-sm-push-2 { - left: 16.66667%; + left: 16.66666667%; } .col-sm-push-1 { - left: 8.33333%; + left: 8.33333333%; } .col-sm-push-0 { left: auto; @@ -725,37 +731,37 @@ pre code { margin-left: 100%; } .col-sm-offset-11 { - margin-left: 91.66667%; + margin-left: 91.66666667%; } .col-sm-offset-10 { - margin-left: 83.33333%; + margin-left: 83.33333333%; } .col-sm-offset-9 { margin-left: 75%; } .col-sm-offset-8 { - margin-left: 66.66667%; + margin-left: 66.66666667%; } .col-sm-offset-7 { - margin-left: 58.33333%; + margin-left: 58.33333333%; } .col-sm-offset-6 { margin-left: 50%; } .col-sm-offset-5 { - margin-left: 41.66667%; + margin-left: 41.66666667%; } .col-sm-offset-4 { - margin-left: 33.33333%; + margin-left: 33.33333333%; } .col-sm-offset-3 { margin-left: 25%; } .col-sm-offset-2 { - margin-left: 16.66667%; + margin-left: 16.66666667%; } .col-sm-offset-1 { - margin-left: 8.33333%; + margin-left: 8.33333333%; } .col-sm-offset-0 { margin-left: 0%; @@ -769,73 +775,73 @@ pre code { width: 100%; } .col-md-11 { - width: 91.66667%; + width: 91.66666667%; } .col-md-10 { - width: 83.33333%; + width: 83.33333333%; } .col-md-9 { width: 75%; } .col-md-8 { - width: 66.66667%; + width: 66.66666667%; } .col-md-7 { - width: 58.33333%; + width: 58.33333333%; } .col-md-6 { width: 50%; } .col-md-5 { - width: 41.66667%; + width: 41.66666667%; } .col-md-4 { - width: 33.33333%; + width: 33.33333333%; } .col-md-3 { width: 25%; } .col-md-2 { - width: 16.66667%; + width: 16.66666667%; } .col-md-1 { - width: 8.33333%; + width: 8.33333333%; } .col-md-pull-12 { right: 100%; } .col-md-pull-11 { - right: 91.66667%; + right: 91.66666667%; } .col-md-pull-10 { - right: 83.33333%; + right: 83.33333333%; } .col-md-pull-9 { right: 75%; } .col-md-pull-8 { - right: 66.66667%; + right: 66.66666667%; } .col-md-pull-7 { - right: 58.33333%; + right: 58.33333333%; } .col-md-pull-6 { right: 50%; } .col-md-pull-5 { - right: 41.66667%; + right: 41.66666667%; } .col-md-pull-4 { - right: 33.33333%; + right: 33.33333333%; } .col-md-pull-3 { right: 25%; } .col-md-pull-2 { - right: 16.66667%; + right: 16.66666667%; } .col-md-pull-1 { - right: 8.33333%; + right: 8.33333333%; } .col-md-pull-0 { right: auto; @@ -844,37 +850,37 @@ pre code { left: 100%; } .col-md-push-11 { - left: 91.66667%; + left: 91.66666667%; } .col-md-push-10 { - left: 83.33333%; + left: 83.33333333%; } .col-md-push-9 { left: 75%; } .col-md-push-8 { - left: 66.66667%; + left: 66.66666667%; } .col-md-push-7 { - left: 58.33333%; + left: 58.33333333%; } .col-md-push-6 { left: 50%; } .col-md-push-5 { - left: 41.66667%; + left: 41.66666667%; } .col-md-push-4 { - left: 33.33333%; + left: 33.33333333%; } .col-md-push-3 { left: 25%; } .col-md-push-2 { - left: 16.66667%; + left: 16.66666667%; } .col-md-push-1 { - left: 8.33333%; + left: 8.33333333%; } .col-md-push-0 { left: auto; @@ -883,37 +889,37 @@ pre code { margin-left: 100%; } .col-md-offset-11 { - margin-left: 91.66667%; + margin-left: 91.66666667%; } .col-md-offset-10 { - margin-left: 83.33333%; + margin-left: 83.33333333%; } .col-md-offset-9 { margin-left: 75%; } .col-md-offset-8 { - margin-left: 66.66667%; + margin-left: 66.66666667%; } .col-md-offset-7 { - margin-left: 58.33333%; + margin-left: 58.33333333%; } .col-md-offset-6 { margin-left: 50%; } .col-md-offset-5 { - margin-left: 41.66667%; + margin-left: 41.66666667%; } .col-md-offset-4 { - margin-left: 33.33333%; + margin-left: 33.33333333%; } .col-md-offset-3 { margin-left: 25%; } .col-md-offset-2 { - margin-left: 16.66667%; + margin-left: 16.66666667%; } .col-md-offset-1 { - margin-left: 8.33333%; + margin-left: 8.33333333%; } .col-md-offset-0 { margin-left: 0%; @@ -927,73 +933,73 @@ pre code { width: 100%; } .col-lg-11 { - width: 91.66667%; + width: 91.66666667%; } .col-lg-10 { - width: 83.33333%; + width: 83.33333333%; } .col-lg-9 { width: 75%; } .col-lg-8 { - width: 66.66667%; + width: 66.66666667%; } .col-lg-7 { - width: 58.33333%; + width: 58.33333333%; } .col-lg-6 { width: 50%; } .col-lg-5 { - width: 41.66667%; + width: 41.66666667%; } .col-lg-4 { - width: 33.33333%; + width: 33.33333333%; } .col-lg-3 { width: 25%; } .col-lg-2 { - width: 16.66667%; + width: 16.66666667%; } .col-lg-1 { - width: 8.33333%; + width: 8.33333333%; } .col-lg-pull-12 { right: 100%; } .col-lg-pull-11 { - right: 91.66667%; + right: 91.66666667%; } .col-lg-pull-10 { - right: 83.33333%; + right: 83.33333333%; } .col-lg-pull-9 { right: 75%; } .col-lg-pull-8 { - right: 66.66667%; + right: 66.66666667%; } .col-lg-pull-7 { - right: 58.33333%; + right: 58.33333333%; } .col-lg-pull-6 { right: 50%; } .col-lg-pull-5 { - right: 41.66667%; + right: 41.66666667%; } .col-lg-pull-4 { - right: 33.33333%; + right: 33.33333333%; } .col-lg-pull-3 { right: 25%; } .col-lg-pull-2 { - right: 16.66667%; + right: 16.66666667%; } .col-lg-pull-1 { - right: 8.33333%; + right: 8.33333333%; } .col-lg-pull-0 { right: auto; @@ -1002,37 +1008,37 @@ pre code { left: 100%; } .col-lg-push-11 { - left: 91.66667%; + left: 91.66666667%; } .col-lg-push-10 { - left: 83.33333%; + left: 83.33333333%; } .col-lg-push-9 { left: 75%; } .col-lg-push-8 { - left: 66.66667%; + left: 66.66666667%; } .col-lg-push-7 { - left: 58.33333%; + left: 58.33333333%; } .col-lg-push-6 { left: 50%; } .col-lg-push-5 { - left: 41.66667%; + left: 41.66666667%; } .col-lg-push-4 { - left: 33.33333%; + left: 33.33333333%; } .col-lg-push-3 { left: 25%; } .col-lg-push-2 { - left: 16.66667%; + left: 16.66666667%; } .col-lg-push-1 { - left: 8.33333%; + left: 8.33333333%; } .col-lg-push-0 { left: auto; @@ -1041,37 +1047,37 @@ pre code { margin-left: 100%; } .col-lg-offset-11 { - margin-left: 91.66667%; + margin-left: 91.66666667%; } .col-lg-offset-10 { - margin-left: 83.33333%; + margin-left: 83.33333333%; } .col-lg-offset-9 { margin-left: 75%; } .col-lg-offset-8 { - margin-left: 66.66667%; + margin-left: 66.66666667%; } .col-lg-offset-7 { - margin-left: 58.33333%; + margin-left: 58.33333333%; } .col-lg-offset-6 { margin-left: 50%; } .col-lg-offset-5 { - margin-left: 41.66667%; + margin-left: 41.66666667%; } .col-lg-offset-4 { - margin-left: 33.33333%; + margin-left: 33.33333333%; } .col-lg-offset-3 { margin-left: 25%; } .col-lg-offset-2 { - margin-left: 16.66667%; + margin-left: 16.66666667%; } .col-lg-offset-1 { - margin-left: 8.33333%; + margin-left: 8.33333333%; } .col-lg-offset-0 { margin-left: 0%; @@ -1096,7 +1102,7 @@ th { } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; - line-height: 1.42857; + line-height: 1.428571429; vertical-align: top; border-top: 1px solid #ddd; } @@ -1263,7 +1269,7 @@ output { display: block; padding-top: 9px; font-size: 13px; - line-height: 1.42857; + line-height: 1.428571429; color: #777; } .form-control { @@ -1272,7 +1278,7 @@ output { height: 36px; padding: 8px 12px; font-size: 13px; - line-height: 1.42857; + line-height: 1.428571429; color: #777; background-color: #fff; background-image: none; @@ -1421,7 +1427,7 @@ textarea.input-sm, select[multiple].input-sm { height: 53px; padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; border-radius: 0px; } select.input-lg { @@ -1435,7 +1441,7 @@ textarea.input-lg, select[multiple].input-lg { height: 53px; padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; border-radius: 0px; } .form-group-lg select.form-control { @@ -1450,7 +1456,7 @@ textarea.input-lg, select[multiple].input-lg { min-height: 35px; padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; } .has-feedback { position: relative; @@ -1624,7 +1630,7 @@ textarea.input-lg, select[multiple].input-lg { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 19.66667px; + padding-top: 19.6666662px; font-size: 17px; } } @@ -1648,7 +1654,7 @@ textarea.input-lg, select[multiple].input-lg { white-space: nowrap; padding: 8px 12px; font-size: 13px; - line-height: 1.42857; + line-height: 1.428571429; border-radius: 0px; -webkit-user-select: none; -moz-user-select: none; @@ -1904,7 +1910,7 @@ a.btn.disabled, fieldset[disabled] a.btn { .btn-lg, .btn-group-lg > .btn { padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; border-radius: 0px; } .btn-sm, .btn-group-sm > .btn { @@ -2026,7 +2032,7 @@ tbody.collapse.in { padding: 3px 20px; clear: both; font-weight: normal; - line-height: 1.42857; + line-height: 1.428571429; color: #444; white-space: nowrap; overflow-x: hidden; @@ -2071,7 +2077,7 @@ tbody.collapse.in { display: block; padding: 3px 20px; font-size: 12px; - line-height: 1.42857; + line-height: 1.428571429; color: #808080; white-space: nowrap; } @@ -2269,7 +2275,7 @@ tbody.collapse.in { height: 53px; padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; border-radius: 0px; } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { @@ -2413,7 +2419,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group- } .nav-tabs > li > a { margin-right: 2px; - line-height: 1.42857; + line-height: 1.428571429; border: 1px solid transparent; border-radius: 0px 0px 0 0; } @@ -3120,7 +3126,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group- position: relative; float: left; padding: 8px 12px; - line-height: 1.42857; + line-height: 1.428571429; text-decoration: none; color: #444; background-color: #fff; @@ -3158,7 +3164,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group- .pagination-lg > li > a, .pagination-lg > li > span { padding: 14px 16px; font-size: 17px; - line-height: 1.33333; + line-height: 1.3333333; } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; @@ -3361,7 +3367,7 @@ a.badge:hover, a.badge:focus { display: block; padding: 4px; margin-bottom: 18px; - line-height: 1.42857; + line-height: 1.428571429; background-color: #fcfcfc; border: 1px solid #ddd; border-radius: 0px; @@ -4120,14 +4126,14 @@ button.close { } .modal-backdrop.in { background-color: rgba(0, 0, 0, 0.5); - backdrop-filter: blur(1px); - -webkit-backdrop-filter: blur(1px); + backdrop-filter: blur(2px); + -webkit-backdrop-filter: blur(2px); } .modal-header { padding: 15px; background-color: #585653; border-bottom: 1px solid #e5e5e5; - min-height: 16.42857px; + min-height: 16.42857143px; } .modal-header .close { margin-top: -2px; @@ -4136,7 +4142,7 @@ button.close { } .modal-title { margin: 0; - line-height: 1.42857; + line-height: 1.428571429; color: #fff; } .modal-body { @@ -4193,7 +4199,7 @@ button.close { font-weight: normal; letter-spacing: normal; line-break: auto; - line-height: 1.42857; + line-height: 1.428571429; text-align: left; text-align: start; text-decoration: none; @@ -4311,7 +4317,7 @@ button.close { font-weight: normal; letter-spacing: normal; line-break: auto; - line-height: 1.42857; + line-height: 1.428571429; text-align: left; text-align: start; text-decoration: none; @@ -4447,7 +4453,7 @@ button.close { .carousel-inner > .item > img, .carousel-inner > .item > a > img { line-height: 1; } -@media all and (transform-3d), (-webkit-transform-3d) { +@media (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { -webkit-transition: -webkit-transform 0.6s ease-in-out; -o-transition: -o-transform 0.6s ease-in-out; diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss index f61e9810c..fb281ee8c 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss +++ b/datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss @@ -1,3 +1,21 @@ +/*! + * Copyright (C) 2013-2019 Combodo SARL + * + * This file is part of iTop. + * + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * iTop is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + */ + @import 'variables.scss'; /*! @@ -5109,8 +5127,8 @@ button.close { } .modal-backdrop.in { background-color: rgba(0, 0, 0, 0.5); - backdrop-filter: blur(1px); - -webkit-backdrop-filter: blur(1px); + backdrop-filter: blur(2px); + -webkit-backdrop-filter: blur(2px); } .modal-header { padding: 15px; From 071a2546115c26d990301ae5eda29a31a7418b87 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 29 Nov 2019 17:40:07 +0100 Subject: [PATCH 04/10] =?UTF-8?q?N=C2=B02311=20Fix=20focus=20set=20to=20su?= =?UTF-8?q?mbit=20button=20when=20pressing=20"tab"=20key=20after=20filing?= =?UTF-8?q?=20inputs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/login/extensionblock/loginformsubmit.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login/extensionblock/loginformsubmit.html.twig b/templates/login/extensionblock/loginformsubmit.html.twig index 15e86a751..66f33ecc4 100644 --- a/templates/login/extensionblock/loginformsubmit.html.twig +++ b/templates/login/extensionblock/loginformsubmit.html.twig @@ -2,5 +2,5 @@ {# @license http://opensource.org/licenses/AGPL-3.0 #}
- +
From c5bea30c64765fff36b9ab570607953c4f8b8eb4 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Mon, 2 Dec 2019 13:47:44 +0100 Subject: [PATCH 05/10] =?UTF-8?q?N=C2=B02329=20PHP=207.4=20compat=20:=20re?= =?UTF-8?q?move=20deprecated=20get=5Fmagic=5Fquotes=5Fgpc()=20function=20c?= =?UTF-8?q?all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/cmdbsource.class.inc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index 53fbc58ed..3b72e76ee 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -576,11 +576,6 @@ class CMDBSource return $aRes; } - // Stripslashes - if (get_magic_quotes_gpc()) - { - $value = stripslashes($value); - } // Quote if not a number or a numeric string if ($bAlways || is_string($value)) { From 6872dbd18025914fae7417435a5ac5664eb52a82 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 28 Nov 2019 15:33:06 +0100 Subject: [PATCH 06/10] :art: Fix bad parameter init --- application/ui.linkswidget.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index 068f967b1..2d709ae94 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -346,7 +346,7 @@ EOF * @throws \CoreException * @throws \DictExceptionMissingString */ - public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj) + public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj) { $sHtmlValue = ''; $sHtmlValue .= "
m_sAttCode}{$this->m_sNameSuffix}\">\n"; From 34aa240840c5f8118bac41308baa9f4a8bf405db Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 29 Nov 2019 16:54:49 +0100 Subject: [PATCH 07/10] :art: Fix bad parameter init --- application/cmdbabstract.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 133a39baa..f9a0cd7bc 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1948,12 +1948,12 @@ EOF $aStyles = array(); $sStyle = ''; - $sWidth = $oAttDef->GetWidth('width', ''); + $sWidth = $oAttDef->GetWidth(); if (!empty($sWidth)) { $aStyles[] = 'width:'.$sWidth; } - $sHeight = $oAttDef->GetHeight('height', ''); + $sHeight = $oAttDef->GetHeight(); if (!empty($sHeight)) { $aStyles[] = 'height:'.$sHeight; From 928c19f923040192d65b9c0ef611b1eda50d9999 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 29 Nov 2019 17:04:10 +0100 Subject: [PATCH 08/10] :white_check_mark: move OQL2SQL tests to another folder --- test/{core => OQL}/OQLToSQLAllClassesTest.php | 0 test/{core => OQL}/OQLToSQLGroupByTest.php | 0 test/{core => OQL}/OQLToSQLTest.php | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename test/{core => OQL}/OQLToSQLAllClassesTest.php (100%) rename test/{core => OQL}/OQLToSQLGroupByTest.php (100%) rename test/{core => OQL}/OQLToSQLTest.php (100%) diff --git a/test/core/OQLToSQLAllClassesTest.php b/test/OQL/OQLToSQLAllClassesTest.php similarity index 100% rename from test/core/OQLToSQLAllClassesTest.php rename to test/OQL/OQLToSQLAllClassesTest.php diff --git a/test/core/OQLToSQLGroupByTest.php b/test/OQL/OQLToSQLGroupByTest.php similarity index 100% rename from test/core/OQLToSQLGroupByTest.php rename to test/OQL/OQLToSQLGroupByTest.php diff --git a/test/core/OQLToSQLTest.php b/test/OQL/OQLToSQLTest.php similarity index 100% rename from test/core/OQLToSQLTest.php rename to test/OQL/OQLToSQLTest.php From 28818010d6027e315ecda543b5458816020709fa Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Mon, 2 Dec 2019 15:46:11 +0100 Subject: [PATCH 09/10] =?UTF-8?q?N=C2=B02558=20Test=20for=20the=20HTMLDOMS?= =?UTF-8?q?anitizer=20white=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Combodo.xml | 122 +++++++++ test/core/HTMLDOMSanitizerTest.php | 231 ++++++++++++------ test/core/sanitizer/README.txt | 1 + .../utf-8_wrong_character_email_truncated.txt | 56 +++++ test/core/sanitizer/input/whitelist_test.html | 14 ++ .../utf-8_wrong_character_email_truncated.txt | 12 + 6 files changed, 361 insertions(+), 75 deletions(-) create mode 100644 test/core/sanitizer/README.txt create mode 100644 test/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt create mode 100644 test/core/sanitizer/input/whitelist_test.html create mode 100644 test/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt diff --git a/.idea/inspectionProfiles/Combodo.xml b/.idea/inspectionProfiles/Combodo.xml index 9cece1eb0..0c552965b 100644 --- a/.idea/inspectionProfiles/Combodo.xml +++ b/.idea/inspectionProfiles/Combodo.xml @@ -1,6 +1,73 @@