inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,082 Commits 324 Branches 2,170 Tags
353ff7b8ee9eb497a9c04159698af38fbf6ba108
Commit Graph

743 Commits

Author SHA1 Message Date
Ramona Popa
d52f479bc5 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Ramona Popa
c58a74a27b RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
Ramona Popa
d809cb7879 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tuna Aksoy
b244b56e7b Feature/rm 4639 rest api refactoring 2 2017-04-12 07:36:12 +01:00
Tuna Aksoy
b8aa5b6d90 Merge branch 'release/V2.5' into merge/Merge_RM-4997 
Conflicts:
	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
	rm-automation/src/test/java/org/alfresco/test/community/level2/filePlan/DestroyRecordFolderActions.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-04-10 22:59:27 +01:00
Tuna Aksoy
fdb46da204 Merge branch 'release/V2.4' into merge-2.5/Merge_RM-4997 2017-04-10 21:00:28 +01:00
Tuna Aksoy
7ff3891856 Fixed failing UI tests 2017-04-10 20:58:10 +01:00
Tuna Aksoy
3677ca19d7 Merge branch 'feature-2.4/RM-4997' into merge-2.5/Merge_RM-4997 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nb.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_pt_BR.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ru.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_zh_CN.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_nb.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_nl.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_pt_BR.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ru.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_zh_CN.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ru.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_it.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_ru.properties
	rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_ja.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_de.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_es.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_fr.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_ja.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_nb.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_nl.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_ru.properties
	rm-community/rm-community-share/config/alfresco/messages/rm_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/config/components/fileplan/events.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-custom-metadata.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-users-and-groups.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/document-details/document-actions.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/fileplan.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/savedsearch.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/savedsearch.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/edit-metadata/edit-metadata-mgr.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/report.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/search/search.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/flash-upload.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/flash-upload.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/html-upload.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/customizations/components/node-details/node-header.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_de.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_it.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_zh_CN.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_pt_BR.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_fr.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_nb.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_es.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_ja.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_nl.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_ru.properties
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/rejected-record-info.get_fr.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_de.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_es.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_fr.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_it.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_ja.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_nb.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_nl.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_pt_BR.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_ru.properties
	rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_zh_CN.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_de.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_es.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_fr.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_it.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_ja.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_nb.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_nl.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_pt_BR.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_ru.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_zh_CN.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_de.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_es.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_fr.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_it.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_ja.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_nb.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_nl.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_pt_BR.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_ru.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_zh_CN.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_de.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_es.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_fr.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_it.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_ja.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_nb.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_nl.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_pt_BR.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_ru.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_zh_CN.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_de.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_es.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_fr.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_it.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_ja.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_nb.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_nl.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_pt_BR.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_ru.properties
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_zh_CN.properties
 2017-04-10 16:19:39 +01:00
Tuna Aksoy
e7a6597eae RM-4997 (Electronic Records added into unfiled records don't get the record identifier into the name) 2017-04-10 13:56:11 +01:00
Ana Bozianu
f0a3d300e0 Merge RM-2396 and RM-3727 to master 2017-04-06 10:52:25 +03:00
Ana Bozianu
75a7285679 Merge 'release/V2.4' into 'release/V2.5' 2017-04-06 10:18:16 +03:00
Ana Bozianu
b1cdc66653 Merge branch 'feature-2.4/RM-3727_VitalRecordsToReviewNotification' into 'release/V2.4' 
Feature 2.4/rm 3727 vital records to review notification

See merge request !194
 2017-04-05 14:41:04 +01:00
Ana Bozianu
af9637f0c7 RM-3727 - fixed typo 2017-04-05 15:18:11 +03:00
Ana Bozianu
dac9f630de RM-3727 - added unit test for reviewed action and removed notification issued property 2017-04-05 12:04:31 +03:00
Ana Bozianu
3f1eec08ba RM-3727 - fixed query and exposed cron job expression in properties 2017-04-04 18:31:17 +03:00
Tuna Aksoy
16d4f726e0 RM-2396: Fixed failing integration tests 2017-04-03 12:05:24 +01:00
Tuna Aksoy
9b23b2cbde RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-28 07:23:39 +01:00
Tom Page
45c4a83b87 RM-4942 Ensure the API sorting is case insensitive. 
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
 2017-03-23 14:22:19 +00:00
Tuna Aksoy
b71dfcb3c7 Merge branch 'release/V2.5' into merge/Merge_2332_2396 
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-03-15 22:17:52 +00:00
Tuna Aksoy
5b7fbc5aa6 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
343cc06f7a Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4 2017-03-15 16:28:38 +00:00
Ana Bozianu
3c045e39ed Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Tuna Aksoy
472debefac Fixed share port for local UI tests and also addressed review comment. 2017-03-15 14:39:57 +00:00
Tuna Aksoy
0e6fa39e51 RM-4804_Transfer_Completed_Records 2017-03-15 13:17:38 +00:00
Ana Bozianu
9b513b98d7 Merge merge-2.5 into master 2017-03-15 13:17:37 +02:00
Ana Bozianu
adfe76c1a2 Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
d729a69922 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
ffc1fe1992 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Tuna Aksoy
5aa3721b91 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
98628c75de RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tuna Aksoy
a9375ada87 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
Silviu Dinuta
fab6cdfe9b RM-4163: added integration test for scenario provided by Roy and got the 
fix from master
 2017-03-09 16:27:50 +02:00
Ana Bozianu
2a09832b97 Merge branch 'feature/RM-4619_createFolderThroughFTP' into 'master' 
RM-4619 - convert the folder nodes before setting identifier

See merge request !89
 2017-03-06 09:36:57 +00:00
Ana Bozianu
f1ec66d9ff RM-4619 - fixed the reject record issue 2017-03-03 15:13:03 +02:00
Tom Page
719f174073 Merge branch 'merge/RM-4308_AuditManagePermissions' into 'master' 
Merge/rm 4308 audit manage permissions

Closes MNT-17512

See merge request !86
 2017-03-03 07:55:05 +00:00
Ana Bozianu
1b366d5dae Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"" 
This reverts commit 98bce296d2.
 2017-03-01 21:32:00 +02:00
Ana Bozianu
98bce296d2 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion" 
This reverts commit 2e39b26c6a.
 2017-03-01 20:46:22 +02:00
Tuna Aksoy
ed01779226 Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d 
Conflicts:
	pom.xml
 2017-02-28 17:41:28 +00:00
Ana Bozianu
29deea36ad RM-4619 - fixed java7 compilation error 2017-02-27 22:23:04 +02:00
Ana Bozianu
2e39b26c6a RM-4619 - add the rm search aspect when a record folder is created via conversion 2017-02-27 20:11:01 +02:00
Ana Bozianu
0b81dd90d6 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02:00
Ana Bozianu
92fa327f1e RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Ana Bozianu
764b13d473 RM-4619 - convert the folder nodes before setting identifier 2017-02-27 12:41:39 +02:00
Tom Page
64d6075ab6 RM-4308 Merge release/V2.5 into master. 2017-02-24 16:04:02 +00:00
Tom Page
9094b483d0 RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +00:00
Tom Page
c3aaa264f0 Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00
Tom Page
ac65ee7758 MNT-17512 Minor fixes after review. 
Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
 2017-02-24 08:05:11 +00:00
Tom Page
78ac6f5261 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
7dab46ad40 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
6616f0c572 MNT-17512 Allow partial updates to audit events. 
This is required so that the multiple calls to add permission and remove
permission do not overwrite each other within the transaction (e.g. if
there are permissions for multiple authorities being added, or if a
permission is being changed for a user).
 2017-02-23 10:51:46 +00:00