Commit Graph

4087 Commits

Author SHA1 Message Date
Oana Nechiforescu
4e1d6a29f6 Merge branch 'feature-2.5/RM-4946PomChangesFor25' into 'release/V2.5'
The only pom changes needed for release 2.5.

See merge request !205
2017-04-12 13:29:36 +01:00
Oana Nechiforescu
2b15f9b076 Review changes + records management service API methods moved to specific classes. Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4946MoveAPIs
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
2017-04-12 15:22:16 +03:00
Ana Bozianu
3d7a93e3ce RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'"
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

See merge request !602

Nb. This does not copy across the updates to the automation tests.

(cherry picked from commit 54d673c176)
2017-04-12 13:02:10 +01:00
Ramona Popa
72e35f2f3d Merge branch 'feature/RM-4639_REST_API_Refactoring_2' into 'master'
Feature/rm 4639 rest api refactoring 2

See merge request !209
2017-04-12 07:36:12 +01:00
Tuna Aksoy
b244b56e7b Feature/rm 4639 rest api refactoring 2 2017-04-12 07:36:12 +01:00
gbroadbent
a3ad6f86ca GERMAN: Amended files for the use of the term "Child" 2017-04-11 16:48:18 +01:00
Tom Page
58bfcd5ccb Record-only merge of release/V2.5 into master. 2017-04-11 13:24:20 +01:00
Tom Page
751cd23ac6 Record-only merge of release/V2.4 into release/V2.5. 2017-04-11 13:22:56 +01:00
Tom Page
23941b6bf1 Record-only merge of release/V2.4.0.x into release/V2.4.
Both branches have been recently localised, so no changes need to be merged
across from release/V2.4.0.x.
2017-04-11 13:20:50 +01:00
Tuna Aksoy
0391eec9ac Merge branch 'merge/Merge_RM-4997' into 'master'
Merge/merge rm 4997

See merge request !208
2017-04-11 06:34:05 +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
18cb7d09dd Merge branch 'feature-2.4/RM-4997' into release/V2.4 2017-04-10 20:58:39 +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
abcaaee818 Merge branch 'release/V2.4' into feature-2.4/RM-4997 2017-04-10 15:39:10 +01:00
gbroadbent
19aac8da3e FRENCH: Updated bundles based on EN rev2017-04-07. Also fixes as indicated in ticket RM-4839 for the (2.5.1 version) 2017-04-10 13:56:26 +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
da3f979774 Merge RM-2396 and RM-3727 to master 2017-04-10 15:18:41 +03:00
Oana Nechiforescu
d30db5bddf Review change. 2017-04-10 12:22:28 +03:00
Oana Nechiforescu
2b5329b2ae The only pom changes needed for release 2.5. 2017-04-09 19:42:07 +03:00
Oana Nechiforescu
8e38d71d9b Some refactoring, moving the methods from classification API to security groups API where they should have been from the start. Trying to make the old classes behave, changing their names. 2017-04-09 11:52:58 +03:00
Oana Nechiforescu
047793b823 Actual valid changes. 2017-04-09 02:21:48 +03:00
Oana Nechiforescu
479bb589bb First changes. 2017-04-07 14:15:16 +03:00
gbroadbent
14a03730e0 SIMPLIFIED CHINESE: Updated bundles based on EN rev2017-04-07 2017-04-07 12:09:13 +01:00
gbroadbent
427f92737f BRAZILIAN PORTUGUESE: Updated bundles based on EN rev2017-04-07 2017-04-07 12:08:35 +01:00
gbroadbent
f279513d4f RUSSIAN: Updated bundles based on EN rev2017-04-07 2017-04-07 12:07:55 +01:00
gbroadbent
1c0783f5df NORWEGIAN BOKMAL: Updated bundles based on EN rev2017-04-07 2017-04-07 12:07:26 +01:00
gbroadbent
d30d1f7170 DUTCH: Updated bundles based on EN rev2017-04-07 2017-04-07 12:06:53 +01:00
gbroadbent
9d503183ca JAPANESE: Updated bundles based on EN rev2017-04-07 2017-04-07 12:06:12 +01:00
gbroadbent
286139ed4e ITALIAN: Updated bundles based on EN rev2017-04-07 2017-04-07 12:05:46 +01:00
gbroadbent
eee451f021 SPANISH: Updated bundles based on EN rev2017-04-07 2017-04-07 12:05:10 +01:00
gbroadbent
9d99745501 GERMAN: Updated bundles based on EN rev2017-04-07 2017-04-07 12:03:20 +01:00
Kristijan Conkas
c0ad216cb7 Merge branch 'feature/RM-4983_Update_readme_file' into 'master'
RM-4983: amended UI testing section

See merge request !196
2017-04-06 09:12:28 +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
Kristijan Conkas
398e591ab7 RM-4983: amended UI testing section 2017-04-05 15:07:58 +01:00
Ana Bozianu
a2af9c1148 RM-3727 - reverted property removal from property files other than english 2017-04-05 17:06:18 +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
e22b90a3d7 RM-3727 - reset cron expression to original one 2017-04-05 16:28:05 +03: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
8dfd240cef RM-2396: Fixed method security config value 2017-04-04 16:25:03 +01:00
gbroadbent
fa1a380598 ITALIAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 17:05:31 +01:00
gbroadbent
ba8a3c9ee2 SIMPLIFIED CHINESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:59:39 +01:00
gbroadbent
c2518426f1 BRAZILIAN PORTUGUESE: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:58:43 +01:00
gbroadbent
8ad5d2d283 RUSSIAN: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:57:52 +01:00
gbroadbent
403849ae84 DUTCH: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:57:13 +01:00
gbroadbent
80a9297341 NORWEGIAN Bokmal: Updated bundle for 2.4.0.x based on EN rev2017-03-09T120542 2017-04-03 16:56:33 +01:00