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
Daniel Dehennin
03a80f03fb
Update README
...
Ref: #30852
2020-10-14 13:31:42 +02:00
Daniel Dehennin
a6eeb05ca9
Smooth the configuration of LemonLDAP::NG on Scribe
...
Ref: #30852
2020-10-14 13:19:05 +02:00
Daniel Dehennin
dec2cb8e79
Harmonize script names
...
Ref: #30852
2020-10-14 13:18:54 +02:00
Daniel Dehennin
1ea5813c8f
Update configuration for version 2.0.7 of LemonLDAP::NG
...
Ref: #30852
2020-10-14 13:18:35 +02:00
Daniel Dehennin
589239352e
Make LemonLDAP::NG useable with Apache2
...
Ref: #30852
2020-10-14 13:18:15 +02:00
Daniel Dehennin
c9c6171367
Prettify the XML
...
And remove useless test sites.
Ref: #30852
2020-10-14 13:18:04 +02:00
Daniel Dehennin
04c73c223b
Don't crash if LemonLDAP::NG is disabled
...
Ref: #30852
2020-10-14 13:17:07 +02:00
Daniel Dehennin
6be262c6fb
LemonLDAP::NG should be installable side by side with EOLESSO
...
Ref: #30852
2020-10-14 13:16:45 +02:00
Daniel Dehennin
04215109ac
Python3 ConfigParser is in configparser module
...
Ref: #30852
2020-10-14 13:16:37 +02:00
Daniel Dehennin
0dd5154b78
Realign dico
...
Ref: #30852
2020-10-14 13:16:21 +02:00
Daniel Dehennin
1ad8da6343
Prepare version 2.8.0
...
* Makefile: Mise à jour de la release.
2020-10-14 13:15:19 +02:00
8f5885406f
Merge branch 'master' into dist/eole/2.7.2/master
2020-09-10 15:10:07 +02:00
eb06eaaf5a
Merge branch 'develop' into staging
2020-09-10 15:05:11 +02:00
eb15ad0846
Merge branch 'develop' into dist/eole/2.7.2/develop
2020-09-03 16:57:11 +02:00
22f5af608e
passage en 2.7.2
2020-09-03 16:47:31 +02:00
ad9059bfae
passage en 2.7.2
2020-09-03 16:44:25 +02:00
7d05697ad0
Merge branch 'develop' into staging
2020-01-16 09:35:09 +01:00
667384db1f
Merge branch 'develop' into dist/eole/2.6.2/develop
2020-01-16 09:28:07 +01:00
