Laurent Destailleur 4 gadi atpakaļ
vecāks
revīzija
75997bb8f5

+ 1 - 1
.github/workflows/stale-issues-safe.yml

@@ -16,7 +16,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
         stale-label: 'Issue Stale (automatic label)'
-        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,hacktoberfest,hacktoberfest-accepted,good first issue,Bug Security (CVE),Analysis of PR in progress'
         days-before-stale: 365
         days-before-close: 10
         operations-per-run: 100

+ 3 - 3
htdocs/admin/modules.php

@@ -662,9 +662,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
-		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
+		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}

+ 1 - 1
htdocs/core/lib/admin.lib.php

@@ -45,7 +45,7 @@ function versiontostring($versionarray)
 /**
  *	Compare 2 versions (stored into 2 arrays).
  *  To check if Dolibarr version is lower than (x,y,z), do "if versioncompare(versiondolibarrarray(), array(x.y.z)) <= 0"
- *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-4)) >= 0) is true if version is 4.0 alpha or higher.
+ *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-5)) >= 0) is true if version is 4.0 alpha or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,0)) >= 0) is true if version is 4.0 final or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,1)) >= 0) is true if version is 4.0.1 or higher.
  *  Alternative way to compare: if ((float) DOL_VERSION >= 4.0) is true if version is 4.0 alpha or higher (works only to compare first and second level)

+ 1 - 1
htdocs/core/modules/modIntracommreport.class.php

@@ -66,7 +66,7 @@ class modIntracommreport extends DolibarrModules
 		$this->requiredby = array();                    // List of modules id to disable if this one is disabled
 		$this->conflictwith = array();                  // List of modules id this module is in conflict with
 		$this->phpmin = array(5,5);                     // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(13,0);     // Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(13, 0, -5);     // Minimum version of Dolibarr required by module
 		$this->langfiles = array("intracommreport");
 
 		// Constants

+ 1 - 1
htdocs/theme/eldy/global.inc.php

@@ -510,7 +510,7 @@ form {
 form#addproduct {
     padding-top: 10px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }

+ 1 - 1
htdocs/theme/md/style.css.php

@@ -632,7 +632,7 @@ form {
     padding:0px;
     margin:0px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }