mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
28b213a1ec
# Conflicts: # rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java # rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java # rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java # rm-automation/src/test/java/org/alfresco/test/TestData.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java # rm-automation/src/test/resources/coreTests.xml # rm-automation/src/test/resources/testng.xml