Merge branch '10400' into 11000

Merge branch '10313' into 10400
Message blocage
2020-12-31 17:47:38 +01:00 · 2020-12-31 17:47:27 +01:00 · 2020-12-31 17:39:36 +01:00
1 changed files with 2 additions and 2 deletions
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@ -173,14 +173,14 @@ class config extends common {
 	];
 	// Sécurité de la  connexion - tentative max avant blocage
 	public static $connectAttempt = [
-		999 => 'Aucune',
+		999 => 'Sécurité désactivée',
 		3 => '3 tentatives',
 		5 => '5 tentatives',
 		10 => '10 tentatives'
 	];
 	// Sécurité de la connexion - durée du blocage
 	public static $connectTimeout = [
-		0 => 'Aucun',
+		0 => 'Sécurité désactivée',
 		300 => '5 minutes',
 		600 => '10 minutes',
 		900 => '15 minutes'
Author	SHA1	Message	Date
fredtempez	21fa4d242c	Merge branch '10400' into 11000	2020-12-31 17:47:38 +01:00
fredtempez	4121504f60	Merge branch '10313' into 10400	2020-12-31 17:47:27 +01:00
fredtempez	1d9e6ddee4	Message blocage	2020-12-31 17:39:36 +01:00