Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BARDOT Jérôme
fusiondirectory
Commits
f5652245
Commit
f5652245
authored
7 years ago
by
Benoit Mortier
Browse files
Options
Download
Plain Diff
Merge branch '1.0.19-fixes'
parents
1d55ee80
03802b90
1.4-fixes
1.2
1.2.3-fixes
1.3.1-fixes
6199-creation-of-new-class-mail-template-new-configuration-menu-item
master
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
fusiondirectory-1.2.1
fusiondirectory-1.2
fusiondirectory-1.1.1
fusiondirectory-1.1
fusiondirectory-1.0.20
No related merge requests found
Changes
66
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
AUTHORS
+3
-0
AUTHORS
Changelog
+23
-0
Changelog
contrib/bin/fusiondirectory-setup
+1
-1
contrib/bin/fusiondirectory-setup
contrib/docs/UPGRADE
+184
-0
contrib/docs/UPGRADE
contrib/man/fusiondirectory-insert-schema.1
+1
-1
contrib/man/fusiondirectory-insert-schema.1
contrib/man/fusiondirectory-setup.1
+1
-1
contrib/man/fusiondirectory-setup.1
contrib/man/fusiondirectory.conf.5
+1
-1
contrib/man/fusiondirectory.conf.5
contrib/openldap/core-fd-conf.schema
+7
-1
contrib/openldap/core-fd-conf.schema
contrib/openldap/template-fd.schema
+2
-2
contrib/openldap/template-fd.schema
html/class_passwordRecovery.inc
+44
-40
html/class_passwordRecovery.inc
html/index.php
+6
-6
html/index.php
html/themes/breezy/style.css
+1
-1
html/themes/breezy/style.css
ihtml/themes/breezy/framework.tpl
+2
-2
ihtml/themes/breezy/framework.tpl
ihtml/themes/breezy/msg_dialog.tpl
+2
-2
ihtml/themes/breezy/msg_dialog.tpl
ihtml/themes/breezy/recovery.tpl
+4
-4
ihtml/themes/breezy/recovery.tpl
include/class_baseSelector.inc
+1
-2
include/class_baseSelector.inc
include/class_management.inc
+1
-1
include/class_management.inc
include/class_objects.inc
+52
-15
include/class_objects.inc
include/class_plugin.inc
+30
-9
include/class_plugin.inc
include/class_session.inc
+17
-3
include/class_session.inc
with
383 additions
and
92 deletions
+383
-92
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets