- 01 Apr, 2015 6 commits
-
-
Côme Bernigaud authored
-
Côme Bernigaud authored
Conflicts: html/themes/default/setup.css plugins/config/class_configInLdap.inc setup/class_setupStep_Checks.inc setup/class_setupStep_Config1.inc setup/class_setupStep_Config2.inc setup/class_setupStep_Config3.inc setup/class_setupStep_Finish.inc setup/class_setupStep_Language.inc setup/class_setupStep_Ldap.inc setup/class_setupStep_Migrate.inc setup/class_setupStep_Welcome.inc setup/setup_checks.tpl setup/setup_config1.tpl setup/setup_config2.tpl setup/setup_finish.tpl setup/setup_frame.tpl setup/setup_welcome.tpl
-
Côme Bernigaud authored
Conflicts: include/class_acl.inc plugins/personal/generic/class_user.inc
-
Côme Bernigaud authored
Conflicts: plugins/admin/ogroups/class_ogroup.inc plugins/admin/ogroups/class_ogroupManagement.inc plugins/admin/ogroups/tabs_ogroups.inc
-
Côme Bernigaud authored
Conflicts: plugins/admin/groups/class_groupManagement.inc plugins/admin/groups/main.inc plugins/admin/ogroups/class_ogroup.inc plugins/admin/ogroups/class_ogroupManagement.inc plugins/admin/ogroups/generic.tpl plugins/admin/ogroups/main.inc plugins/admin/ogroups/ogroup-list.xml
-
Côme Bernigaud authored
Conflicts: include/class_config.inc include/select/objectSelect/class_objectSelect.inc plugins/admin/groups/class_group.inc plugins/admin/ogroups/class_ogroup.inc plugins/personal/generic/class_user.inc
-
- 31 Mar, 2015 28 commits
-
-
Côme Bernigaud authored
This will be used for imports and webservice
-
Côme Bernigaud authored
Also use uppercase in departements type list
-
Côme Bernigaud authored
-
Côme Bernigaud authored
-
Côme Bernigaud authored
Conflicts: plugins/admin/users/class_userManagement.inc plugins/personal/generic/class_user.inc setup/class_setupStep_Migrate.inc
-
Côme Bernigaud authored
-
Côme Bernigaud authored
Conflicts: include/class_plugin.inc include/functions.inc plugins/admin/users/class_userManagement.inc plugins/personal/posix/class_posixAccount.inc
-
Côme Bernigaud authored
Conflicts: contrib/openldap/template-fd.schema include/class_plugin.inc plugins/admin/groups/class_group.inc plugins/admin/ogroups/objectSelect/selectObject-filter.xml plugins/admin/users/user-list.xml plugins/personal/generic/class_user.inc plugins/personal/posix/class_posixAccount.inc plugins/personal/posix/trustSelect/trust-filter.xml
-
Côme Bernigaud authored
Conflicts: plugins/admin/groups/class_group.inc plugins/admin/groups/class_groupManagement.inc plugins/admin/groups/generic.tpl plugins/admin/groups/group-filter.xml plugins/admin/groups/group-list.xml plugins/admin/groups/tabs_group.inc
-
Côme Bernigaud authored
Conflicts: plugins/admin/groups/class_group.inc
-
Côme Bernigaud authored
-
Côme Bernigaud authored
Conflicts: include/class_sortableListing.inc
-
Côme Bernigaud authored
Conflicts: include/class_plugin.inc plugins/admin/users/class_userManagement.inc
-
Côme Bernigaud authored
Adapted plugin move so that it takes care of update_acls in both mode (rename or copy/remove). That allows tabs_user to inherit simpleTabs::save Conflicts: include/class_plugin.inc plugins/admin/users/tabs_user.inc
-
Côme Bernigaud authored
Conflicts: include/class_plugin.inc plugins/admin/users/tabs_user.inc plugins/personal/posix/class_posixAccount.inc
-
Côme Bernigaud authored
Conflicts: html/themes/default/icons/48/types/contact.png plugins/personal/generic/class_user.inc plugins/personal/generic/generic.tpl plugins/personal/generic/generic_certs.tpl plugins/personal/generic/generic_picture.tpl
-
Côme Bernigaud authored
Conflicts: include/class_config.inc plugins/admin/users/tabs_user.inc plugins/personal/generic/class_user.inc
-
Côme Bernigaud authored
Conflicts: include/class_certificate.inc include/class_session.inc
-
Côme Bernigaud authored
-
Côme Bernigaud authored
-
Côme Bernigaud authored
-
Benoit Mortier authored
Releasing FusionDirectory 1.0.8.5
-
Benoit Mortier authored
-
Benoit Mortier authored
-
Benoit Mortier authored
-
Benoit Mortier authored
-
Benoit Mortier authored
-
Benoit Mortier authored
-
- 30 Mar, 2015 3 commits
-
-
Côme Bernigaud authored
-
Côme Bernigaud authored
-
Côme Bernigaud authored
-
- 25 Mar, 2015 1 commit
-
-
Côme Bernigaud authored
-
- 20 Mar, 2015 2 commits
-
-
Benoit Mortier authored
-
Benoit Mortier authored
-