Merge branch 'master' into dist/envole/7/master

This commit is contained in:
Arnaud Fornerot 2021-10-07 11:10:02 +02:00
commit 6e69322db8
1 changed files with 4 additions and 3 deletions

View File

@ -19,7 +19,7 @@
</containers>
<variables>
<family name='ninesurvey'>
<family name='ninesurvey' icon='ticket'>
<variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
<variable name='activer_ninesurvey' type='oui/non' description='Activer ninesurvey'>
@ -52,8 +52,9 @@
<variable type='string' name='ninesurvey_smtppwd' description='Mot de passe associé du compte SMTP' />
<variable type='string' name='ninesurvey_smtpencryption' description='Type Encryptage du serveur SMTP' />
<variable type='string' name='ninesurvey_smtpauthmode' description='Mode Authentification du serveur SMTP' />
</family>
<family name='EoleDB' icon='database' mode='expert'>
<!-- BDD -->
<variable type='string' name='ninesurvey_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
<variable type='string' name='ninesurvey_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
@ -66,7 +67,7 @@
<separators>
<separator name="ninesurvey_ldaptemplate">Paramètres associés à l'Annuaire</separator>
<separator name="ninesurvey_noreply">Paramètres associés aux Mails</separator>
<separator name="ninesurvey_db_mode">Paramètres associés à la Base de Données</separator>
<separator name="ninesurvey_db_mode">Paramètres EoleDB associés à Ninesurvey</separator>
</separators>
</variables>