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
fusiondirectory
fusiondirectory
Commits
e27f5c48
Commit
e27f5c48
authored
11 years ago
by
Benoit Mortier
Browse files
Options
Download
Plain Diff
Merge branch 'develop-1.0.6'
parents
d9a059ef
ff5901dc
No related merge requests found
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
contrib/bin/fusiondirectory-insert-schema
+22
-3
contrib/bin/fusiondirectory-insert-schema
contrib/bin/schema2ldif
+3
-3
contrib/bin/schema2ldif
contrib/develop/FDStandard/ruleset.xml
+61
-15
contrib/develop/FDStandard/ruleset.xml
contrib/man/fusiondirectory.1
+1
-1
contrib/man/fusiondirectory.1
contrib/man/fusiondirectory.conf.5
+25
-4
contrib/man/fusiondirectory.conf.5
contrib/man/fusiondirectory.conf.pod
+6
-0
contrib/man/fusiondirectory.conf.pod
contrib/openldap/update-from-1.0.3-to-1.0.4/remove-trust.ldif
+0
-9
...rib/openldap/update-from-1.0.3-to-1.0.4/remove-trust.ldif
contrib/openldap/update-from-1.0.3-to-1.0.4/update-recovery.ldif
+0
-22
.../openldap/update-from-1.0.3-to-1.0.4/update-recovery.ldif
html/index.php
+2
-2
html/index.php
html/main.php
+4
-2
html/main.php
ihtml/themes/default/accountexpired.tpl
+13
-13
ihtml/themes/default/accountexpired.tpl
ihtml/themes/default/copyPasteDialog.tpl
+7
-7
ihtml/themes/default/copyPasteDialog.tpl
ihtml/themes/default/login.tpl
+19
-19
ihtml/themes/default/login.tpl
ihtml/themes/default/msg_dialog.tpl
+33
-33
ihtml/themes/default/msg_dialog.tpl
ihtml/themes/default/password.tpl
+21
-21
ihtml/themes/default/password.tpl
ihtml/themes/default/recovery.tpl
+27
-27
ihtml/themes/default/recovery.tpl
ihtml/themes/default/snapshotdialog.tpl
+7
-7
ihtml/themes/default/snapshotdialog.tpl
include/class_userinfo.inc
+189
-53
include/class_userinfo.inc
include/functions.inc
+5
-159
include/functions.inc
include/simpleplugin/class_simpleManagement.inc
+22
-3
include/simpleplugin/class_simpleManagement.inc
with
467 additions
and
403 deletions
+467
-403
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