 Philippe Caseiro
|
b6cf7bb9e3
|
Fix bad merge
|
2020-11-26 14:04:51 +01:00 |
|
Philippe Caseiro
|
ed37cb6666
|
fix conflict
|
2020-11-26 13:50:37 +01:00 |
|
Philippe Caseiro
|
815fca0e82
|
Merge branch 'master' of https://dev-eole.ac-dijon.fr/git/eole-lemonldap-ng
|
2020-11-26 13:49:34 +01:00 |
|
Philippe Caseiro
|
8ec486eafc
|
Adding syslog configuration
|
2020-11-26 13:48:14 +01:00 |
|
Philippe Caseiro
|
4af11f3d28
|
Cleanup dico and support for loglevel
|
2020-11-26 13:47:47 +01:00 |
|
Philippe Caseiro
|
8af3ee655f
|
Cleanup dico
|
2020-11-26 13:43:33 +01:00 |
|
Philippe Caseiro
|
774d06913b
|
Fix conflict
|
2020-11-26 13:22:55 +01:00 |
|
Philippe Caseiro
|
5d4e572967
|
Fixing log format
|
2020-11-26 13:21:49 +01:00 |
|
Philippe Caseiro
|
15da7394f3
|
Make eole-lemonldap-ng compatible with eolebase
|
2020-11-24 15:47:38 +01:00 |
 vfebvre
|
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 |
|
Philippe Caseiro
|
7912544665
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:45:14 +01:00 |
|
Philippe Caseiro
|
e348aa7381
|
Fix daemon default configuration
|
2020-11-24 14:45:02 +01:00 |
|
Philippe Caseiro
|
66c57c702b
|
Fix missing dep
|
2020-11-24 14:41:09 +01:00 |
|
Philippe Caseiro
|
6aa8c6ceff
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:33:28 +01:00 |
|
Philippe Caseiro
|
dfeb49f3d6
|
Fix missing sso port
|
2020-11-24 14:33:17 +01:00 |
|
Philippe Caseiro
|
5ccad1d1f7
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:27:36 +01:00 |
|
Philippe Caseiro
|
36fe95a0ca
|
Adding eolesso_cas_folder variable redefine
|
2020-11-24 14:27:23 +01:00 |
|
Philippe Caseiro
|
2c8a46ab16
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:22:43 +01:00 |
|
Philippe Caseiro
|
7ea9061878
|
Adding missing dep
|
2020-11-24 14:22:18 +01:00 |
|
Philippe Caseiro
|
027d549e18
|
we now need eole-ldapclient
|
2020-11-24 14:20:54 +01:00 |
|
Philippe Caseiro
|
0fda6b9e59
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:17:13 +01:00 |
|
Philippe Caseiro
|
48c524c555
|
Fix ldap_tls redefine
|
2020-11-24 14:17:00 +01:00 |
|
Philippe Caseiro
|
f5c5681d5e
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 14:00:29 +01:00 |
|
Philippe Caseiro
|
24d49c49e3
|
Fix ldap_tls missing variable
|
2020-11-24 14:00:20 +01:00 |
|
Philippe Caseiro
|
e5b6b94f7c
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 13:54:24 +01:00 |
|
Philippe Caseiro
|
578090525e
|
Fix dicos
|
2020-11-24 13:54:10 +01:00 |
|
Philippe Caseiro
|
21a8bc8b91
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 13:50:40 +01:00 |
|
Philippe Caseiro
|
25006949e8
|
Fix redefine for eolebase compat
|
2020-11-24 13:50:29 +01:00 |
|
Philippe Caseiro
|
f6fb864962
|
Merge branch '2.7.2/master' into dist/eole/2.7.2/master
|
2020-11-24 13:31:42 +01:00 |
|
Philippe Caseiro
|
faac2bb213
|
Merge branch 'master' into 2.7.2/master
|
2020-11-24 13:31:11 +01:00 |
|
Philippe Caseiro
|
944dbed98a
|
Cleanup merge fail
|
2020-11-24 13:27:45 +01:00 |
|
vfebvre
|
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 |
|
Philippe Caseiro
|
25f36f63a0
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-24 11:08:57 +01:00 |
|
Philippe Caseiro
|
fd4ee5dc87
|
Fix reset password bug
|
2020-11-24 11:08:33 +01:00 |
|
Philippe Caseiro
|
9a7db5bd01
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-24 10:54:09 +01:00 |
|
Philippe Caseiro
|
70a1c26d53
|
Fix disable if in
|
2020-11-24 10:53:58 +01:00 |
|
Philippe Caseiro
|
c150f446c8
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-24 09:32:41 +01:00 |
|
Philippe Caseiro
|
09fcd2eacb
|
Disable service
|
2020-11-24 09:31:12 +01:00 |
|
Philippe Caseiro
|
6bf3f75087
|
Don't run postservice if service is disabled
|
2020-11-24 09:30:08 +01:00 |
|
Philippe Caseiro
|
0a5f0f7d94
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-20 14:45:38 +01:00 |
|
Philippe Caseiro
|
beb6341981
|
Fix llResetUrl bugé
|
2020-11-20 14:44:51 +01:00 |
|
Philippe Caseiro
|
b81f96f0dd
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-20 14:35:46 +01:00 |
|
Philippe Caseiro
|
eafbc3bd8a
|
Fix typo
|
2020-11-20 14:34:56 +01:00 |
|
Philippe Caseiro
|
46c699813e
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-20 14:30:07 +01:00 |
|
Philippe Caseiro
|
7e3f6d3408
|
Updating readme
|
2020-11-20 11:16:29 +01:00 |
|
Philippe Caseiro
|
84ad8d7fbd
|
Merge branch 'master' into dist/eole/2.7.2/master
|
2020-11-20 11:07:45 +01:00 |
|
Philippe Caseiro
|
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 |