Merge branch 'hotfix/2.1.1' into 'feature/7318-HideButtonAddOrganization'
# Conflicts: # src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
No related branches found
No related tags found
Showing
- data/maarchRM/conf/configuration.ini.default 4 additions, 4 deletionsdata/maarchRM/conf/configuration.ini.default
- dependency/html/Document.php 1 addition, 1 deletiondependency/html/Document.php
- src/bundle/audit/Observer/logger.php 2 additions, 0 deletionssrc/bundle/audit/Observer/logger.php
- src/bundle/auth/Controller/ForgotAccountTrait.php 26 additions, 20 deletionssrc/bundle/auth/Controller/ForgotAccountTrait.php
- src/bundle/auth/Message/newUserAccount.php 1 addition, 1 deletionsrc/bundle/auth/Message/newUserAccount.php
- src/bundle/auth/Message/userAccountUpdate.php 1 addition, 1 deletionsrc/bundle/auth/Message/userAccountUpdate.php
- src/bundle/batchProcessing/Controller/scheduling.php 12 additions, 7 deletionssrc/bundle/batchProcessing/Controller/scheduling.php
- src/bundle/organization/Controller/orgContact.php 11 additions, 0 deletionssrc/bundle/organization/Controller/orgContact.php
- src/bundle/organization/Resources/countries-codes.json 1247 additions, 0 deletionssrc/bundle/organization/Resources/countries-codes.json
- src/bundle/organization/orgContactInterface.php 7 additions, 0 deletionssrc/bundle/organization/orgContactInterface.php
- src/bundle/recordsManagement/Controller/archive.php 4 additions, 4 deletionssrc/bundle/recordsManagement/Controller/archive.php
- src/bundle/recordsManagement/Controller/archiveAccessTrait.php 42 additions, 22 deletions...undle/recordsManagement/Controller/archiveAccessTrait.php
- src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php 3 additions, 1 deletion...ecordsManagement/Controller/archiveCommunicationTrait.php
- src/bundle/recordsManagement/Controller/description.php 2 additions, 2 deletionssrc/bundle/recordsManagement/Controller/description.php
- src/bundle/recordsManagement/Message/archivalProfile.php 1 addition, 1 deletionsrc/bundle/recordsManagement/Message/archivalProfile.php
- src/presentation/maarchRM/Presenter/Exception.php 16 additions, 11 deletionssrc/presentation/maarchRM/Presenter/Exception.php
- src/presentation/maarchRM/Presenter/auth/user.php 1 addition, 1 deletionsrc/presentation/maarchRM/Presenter/auth/user.php
- src/presentation/maarchRM/Presenter/organization/orgTree.php 2 additions, 0 deletionssrc/presentation/maarchRM/Presenter/organization/orgTree.php
- src/presentation/maarchRM/Resources/locale/fr/audit/messages.po 9 additions, 0 deletions...esentation/maarchRM/Resources/locale/fr/audit/messages.po
- src/presentation/maarchRM/Resources/locale/fr/auth/messages.po 2 additions, 2 deletions...resentation/maarchRM/Resources/locale/fr/auth/messages.po
Loading
Please register or sign in to comment