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
Blond Jérémie
fusiondirectory
Commits
34b8b737
Commit
34b8b737
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Plain Diff
Merge branch '5951-main-inc-files-should-not-be-needed' into '1.4-dev'
Resolve "main.inc files should not be needed." See merge request fusiondirectory/fd!513
parents
d0394191
002bc57c
dev
master
fusiondirectory-1.4
No related merge requests found
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
html/main.php
+13
-46
html/main.php
html/setup.php
+1
-2
html/setup.php
include/class_pluglist.inc
+44
-1
include/class_pluglist.inc
include/management/class_management.inc
+5
-1
include/management/class_management.inc
include/simpleplugin/class_simplePlugin.inc
+9
-1
include/simpleplugin/class_simplePlugin.inc
plugins/addons/dashboard/class_dashboard.inc
+13
-1
plugins/addons/dashboard/class_dashboard.inc
plugins/addons/dashboard/class_dashboardPasswords.inc
+0
-0
plugins/addons/dashboard/class_dashboardPasswords.inc
plugins/addons/dashboard/class_dashboardUsers.inc
+0
-0
plugins/addons/dashboard/class_dashboardUsers.inc
plugins/addons/dashboard/main.inc
+0
-22
plugins/addons/dashboard/main.inc
plugins/admin/acl/main.inc
+0
-21
plugins/admin/acl/main.inc
plugins/admin/aclrole/main.inc
+0
-22
plugins/admin/aclrole/main.inc
plugins/admin/departments/main.inc
+0
-23
plugins/admin/departments/main.inc
plugins/admin/groups/main.inc
+0
-22
plugins/admin/groups/main.inc
plugins/admin/users/main.inc
+0
-23
plugins/admin/users/main.inc
plugins/config/class_configInLdap.inc
+15
-0
plugins/config/class_configInLdap.inc
plugins/config/main.inc
+0
-22
plugins/config/main.inc
plugins/personal/generic/main.inc
+0
-22
plugins/personal/generic/main.inc
plugins/personal/roles/main.inc
+0
-22
plugins/personal/roles/main.inc
setup/class_setup.inc
+21
-2
setup/class_setup.inc
setup/main.inc
+0
-35
setup/main.inc
with
121 additions
and
288 deletions
+121
-288
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