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-plugins
Commits
fa1efcbf
Commit
fa1efcbf
authored
1 year ago
by
bmortier
Browse files
Options
Download
Plain Diff
Merge branch '1.4-dev' into 'master'
Merge 1.4-dev into master See merge request fusiondirectory/fd-plugins!1001
parents
4482c26f
ecad682f
dev
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Changelog.md
+11
-1
Changelog.md
archive/admin/archive/class_archiveManagement.inc
+2
-1
archive/admin/archive/class_archiveManagement.inc
argonaut/dashboard/argonaut/class_argonautAction.inc
+0
-0
argonaut/dashboard/argonaut/class_argonautAction.inc
argonaut/dashboard/argonaut/class_argonautEventTypes.inc
+0
-0
argonaut/dashboard/argonaut/class_argonautEventTypes.inc
argonaut/dashboard/argonaut/class_argonautImportFile.inc
+0
-0
argonaut/dashboard/argonaut/class_argonautImportFile.inc
argonaut/dashboard/argonaut/class_argonautQueue.inc
+1
-1
argonaut/dashboard/argonaut/class_argonautQueue.inc
argonaut/dashboard/argonaut/class_argonautQueueColumn.inc
+0
-0
argonaut/dashboard/argonaut/class_argonautQueueColumn.inc
argonaut/dashboard/argonaut/class_argonautQueueFilter.inc
+0
-0
argonaut/dashboard/argonaut/class_argonautQueueFilter.inc
argonaut/dashboard/argonaut/import_events.tpl
+0
-0
argonaut/dashboard/argonaut/import_events.tpl
audit/reports/audit/class_auditEvent.inc
+0
-0
audit/reports/audit/class_auditEvent.inc
audit/reports/audit/class_auditManagement.inc
+2
-1
audit/reports/audit/class_auditManagement.inc
developers/reports/debugHelp/class_debugHelp.inc
+1
-1
developers/reports/debugHelp/class_debugHelp.inc
developers/reports/debugHelp/debughelp.tpl
+0
-0
developers/reports/debugHelp/debughelp.tpl
fusioninventory/dashboard/inventory/class_InventoryOperatingSystemColumn.inc
+0
-0
...hboard/inventory/class_InventoryOperatingSystemColumn.inc
fusioninventory/dashboard/inventory/class_inventoryManagement.inc
+1
-1
...ventory/dashboard/inventory/class_inventoryManagement.inc
gpg/configuration/gpg/class_pgpServerInfo.inc
+0
-0
gpg/configuration/gpg/class_pgpServerInfo.inc
ldapdump/generic/ldapdump/class_ldapDump.inc
+0
-0
ldapdump/generic/ldapdump/class_ldapDump.inc
ldapdump/generic/ldapdump/ldapdump.tpl
+0
-0
ldapdump/generic/ldapdump/ldapdump.tpl
ldapmanager/export/ldapmanager/class_BaseSelectorOrDnAttribute.inc
+0
-0
...er/export/ldapmanager/class_BaseSelectorOrDnAttribute.inc
ldapmanager/export/ldapmanager/class_csvImport.inc
+0
-0
ldapmanager/export/ldapmanager/class_csvImport.inc
with
18 additions
and
6 deletions
+18
-6
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