774d06913b
Fix conflict
2020-11-26 13:22:55 +01:00
5d4e572967
Fixing log format
2020-11-26 13:21:49 +01:00
15da7394f3
Make eole-lemonldap-ng compatible with eolebase
2020-11-24 15:47:38 +01:00
536da57382
parent d08c965ee8
...
author vfebvre <vfebvre@cadoles.com> 1599144265 +0200
committer Philippe Caseiro <pcaseiro@cadoles.com> 1606220045 +0100
Corrections diverses
2020-11-24 15:47:38 +01:00
7912544665
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:45:14 +01:00
e348aa7381
Fix daemon default configuration
2020-11-24 14:45:02 +01:00
66c57c702b
Fix missing dep
2020-11-24 14:41:09 +01:00
6aa8c6ceff
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:33:28 +01:00
dfeb49f3d6
Fix missing sso port
2020-11-24 14:33:17 +01:00
5ccad1d1f7
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:27:36 +01:00
36fe95a0ca
Adding eolesso_cas_folder variable redefine
2020-11-24 14:27:23 +01:00
2c8a46ab16
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:22:43 +01:00
7ea9061878
Adding missing dep
2020-11-24 14:22:18 +01:00
027d549e18
we now need eole-ldapclient
2020-11-24 14:20:54 +01:00
0fda6b9e59
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:17:13 +01:00
48c524c555
Fix ldap_tls redefine
2020-11-24 14:17:00 +01:00
f5c5681d5e
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 14:00:29 +01:00
24d49c49e3
Fix ldap_tls missing variable
2020-11-24 14:00:20 +01:00
e5b6b94f7c
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 13:54:24 +01:00
578090525e
Fix dicos
2020-11-24 13:54:10 +01:00
21a8bc8b91
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 13:50:40 +01:00
25006949e8
Fix redefine for eolebase compat
2020-11-24 13:50:29 +01:00
f6fb864962
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
2020-11-24 13:31:42 +01:00
faac2bb213
Merge branch 'master' into 2.7.2/master
2020-11-24 13:31:11 +01:00
944dbed98a
Cleanup merge fail
2020-11-24 13:27:45 +01:00
c1478b7e77
parent d08c965ee8
...
author vfebvre <vfebvre@cadoles.com> 1599144265 +0200
committer Philippe Caseiro <pcaseiro@cadoles.com> 1606220045 +0100
Corrections diverses
2020-11-24 13:19:52 +01:00
25f36f63a0
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-24 11:08:57 +01:00
fd4ee5dc87
Fix reset password bug
2020-11-24 11:08:33 +01:00
9a7db5bd01
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-24 10:54:09 +01:00
70a1c26d53
Fix disable if in
2020-11-24 10:53:58 +01:00
c150f446c8
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-24 09:32:41 +01:00
09fcd2eacb
Disable service
2020-11-24 09:31:12 +01:00
6bf3f75087
Don't run postservice if service is disabled
2020-11-24 09:30:08 +01:00
0a5f0f7d94
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-20 14:45:38 +01:00
beb6341981
Fix llResetUrl bugé
2020-11-20 14:44:51 +01:00
b81f96f0dd
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-20 14:35:46 +01:00
eafbc3bd8a
Fix typo
2020-11-20 14:34:56 +01:00
46c699813e
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-20 14:30:07 +01:00
7e3f6d3408
Updating readme
2020-11-20 11:16:29 +01:00
84ad8d7fbd
Merge branch 'master' into dist/eole/2.7.2/master
2020-11-20 11:07:45 +01:00
edc22cacc2
Fix help and variable type
2020-11-20 11:06:51 +01:00
Joël Cuissinat
d08c965ee8
Merge branch '2.8.0/master'
2020-11-16 15:46:53 +01:00
Joël Cuissinat
b9ef7ec41d
dicos/70_lemonldap_ng.xml : cosmetic fixes
...
* add "lemon" icon
* add help on family
Ref: #30576
2020-11-16 15:40:44 +01:00
Daniel Dehennin
f2e6a3afe0
Merge branch '2.8.0/master' into master
2020-10-16 09:52:25 +02:00
Daniel Dehennin
251a9a3907
Disable the apache servicelist when LemonLDAP::NG is disabled
...
Ref: #30852
2020-10-16 09:47:14 +02:00
Daniel Dehennin
2700a5d440
Prepare version 2.8.1
...
* Makefile: Mise à jour de la version.
Mise à jour de la release.
* .gitignore: règles minimale pour les fichiers de sauvegarde des
éditeurs.
2020-10-15 09:34:31 +02:00
Daniel Dehennin
9b66227236
eolesso_adresse should be forced only when LemonLDAP::NG is enabled
...
The “calc_val” was failing when LemonLDAP::NG was disabled because
“authWebName” can't be used.
We shouldn't force “eolesso_adresse” when LemonLDAP::NG is disabled,
the user must be able to set whatever value she wants.
* dicos/71_lemonldap_ng_scribe.xml: fill the “eolesso_adresse” and
freeze it when LemonLDAP::NG is enabled.
Ref: #30852
2020-10-15 09:07:40 +02:00
Daniel Dehennin
90411f89f7
Override previous fill on eolesso_adresse
...
Ref: #30852
2020-10-14 15:54:41 +02:00
Daniel Dehennin
d99ac8c9ad
Force local SSO on Scribe
...
Ref: #30852
2020-10-14 15:46:39 +02:00
Daniel Dehennin
f43fca1a98
Don't modify /etc/hosts on ScribeAD
...
Ref: #30852
2020-10-14 13:52:41 +02:00
