Merge branch 'feature/7322-EventLoggingException' into hotfix/2.1.2
# Conflicts: # src/presentation/maarchRM/Resources/locale/fr/audit/messages.po
Showing
- src/bundle/audit/Controller/journal.php 11 additions, 0 deletionssrc/bundle/audit/Controller/journal.php
- src/bundle/audit/Observer/logger.php 6 additions, 1 deletionsrc/bundle/audit/Observer/logger.php
- src/bundle/batchProcessing/Controller/scheduling.php 11 additions, 3 deletionssrc/bundle/batchProcessing/Controller/scheduling.php
- src/bundle/recordsManagement/Controller/archiveComplianceTrait.php 35 additions, 1 deletion...e/recordsManagement/Controller/archiveComplianceTrait.php
- src/bundle/recordsManagement/Controller/log.php 15 additions, 1 deletionsrc/bundle/recordsManagement/Controller/log.php
- src/presentation/maarchRM/Presenter/audit/event.php 5 additions, 2 deletionssrc/presentation/maarchRM/Presenter/audit/event.php
- src/presentation/maarchRM/Presenter/batchProcessing/logScheduling.php 21 additions, 1 deletion...tion/maarchRM/Presenter/batchProcessing/logScheduling.php
- src/presentation/maarchRM/Resources/locale/fr/audit/messages.po 36 additions, 0 deletions...esentation/maarchRM/Resources/locale/fr/audit/messages.po
- src/presentation/maarchRM/Resources/view/audit/modalEvent.html 1 addition, 1 deletion...resentation/maarchRM/Resources/view/audit/modalEvent.html
- src/presentation/maarchRM/Resources/view/audit/search.html 1 addition, 0 deletionssrc/presentation/maarchRM/Resources/view/audit/search.html
- src/presentation/maarchRM/Resources/view/batchProcessing/logScheduling/modalEvent.html 6 additions, 5 deletions...ources/view/batchProcessing/logScheduling/modalEvent.html
Loading
Please register or sign in to comment