Merge branch '2.7.2/master' into dist/eole/2.7.2/master

Fix Register button display
Merge branch 'master' into dist/eole/2.7.2/master
2021-01-29 10:51:41 +01:00 · 2021-01-29 10:51:24 +01:00 · 2021-01-29 10:10:24 +01:00 · 2021-01-29 10:10:15 +01:00 · 2021-01-28 11:04:52 +01:00 · 2021-01-28 11:03:55 +01:00
3 changed files with 3 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ LemonLDAP::NG EOLE integration

 GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt

-#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
+#### LemonLDAP::NG repository (if you use EOLE 2.8.X this is not needed anymore)
 
 * deb     https://lemonldap-ng.org/deb stable main
 * deb-src https://lemonldap-ng.org/deb stable main
--- a/debian/control
+++ b/debian/control
@ -48,9 +48,9 @@ Depends: lemonldap-ng,
         libnet-ldap-perl,
         libunicode-string-perl,
         libmime-tools-perl,
+         libio-socket-timeout-perl,
         libnet-openid-server-perl,
         ${misc:Depends}
-
 Description: Paquet de dépendances pour eole-lemonldap.
 .
 Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@ -286,7 +286,7 @@
    "portalDisplayChangePassword": "$_auth =~ /^(AD|LDAP|DBI|Demo)$/",
    "portalDisplayLoginHistory": 1,
    "portalDisplayLogout": 1,
-    "portalDisplayRegister": 1,
+    "portalDisplayRegister": %%boolean[%%llRegisterAccount],
    "portalDisplayResetPassword": %%boolean[%%llResetPassword],
    "portalForceAuthn": 0,
    "portalForceAuthnInterval": 0,
Author	SHA1	Message	Date
Philippe Caseiro	7084e18a11	Merge branch '2.7.2/master' into dist/eole/2.7.2/master	2021-01-29 10:51:41 +01:00
Philippe Caseiro	0f0e822069	Fix Register button display	2021-01-29 10:51:24 +01:00
Philippe Caseiro	acb1e51d09	Merge branch 'master' into dist/eole/2.7.2/master	2021-01-29 10:10:24 +01:00
Philippe Caseiro	583e77d7c7	Fix Register button display	2021-01-29 10:10:15 +01:00
Philippe Caseiro	534784d296	Merge branch 'master' into dist/eole/2.7.2/master	2021-01-28 11:04:52 +01:00
Philippe Caseiro	0388ccb095	Adding missing dep for libio-socket-timeout-perl	2021-01-28 11:03:55 +01:00
pcaseiro	eddc9696c3	Mise à jour de 'README.md'	2021-01-06 11:23:29 +01:00
Philippe Caseiro	432f61b73c	Fix control file	2020-12-28 18:48:20 +01:00