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
3bb897a4
Commit
3bb897a4
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Plain Diff
Merge branch '6120-cleanup-lock-system' into '1.4-dev'
Resolve "Cleanup lock system" See merge request fusiondirectory/fd!814
parents
29b6cae8
14f4e5ff
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
ihtml/themes/breezy/islocked.tpl
+1
-1
ihtml/themes/breezy/islocked.tpl
include/class_Lock.inc
+339
-0
include/class_Lock.inc
include/class_config.inc
+2
-2
include/class_config.inc
include/functions.inc
+0
-278
include/functions.inc
include/login/class_LoginMethod.inc
+1
-1
include/login/class_LoginMethod.inc
include/management/class_management.inc
+19
-90
include/management/class_management.inc
include/simpleplugin/class_simplePlugin.inc
+6
-6
include/simpleplugin/class_simplePlugin.inc
with
368 additions
and
378 deletions
+368
-378
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