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
4,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

174 Commits

Author SHA1 Message Date
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
785be592b2 RM-3265 - added integration test for moving a closed folder 2017-03-13 18:20:39 +02:00
Silviu Dinuta
e7176597e8 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
0353a21611 Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"" 
This reverts commit b055176b14.
 2017-03-01 21:32:00 +02:00
Ana Bozianu
b055176b14 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion" 
This reverts commit 92b9f4df4a.
 2017-03-01 20:46:22 +02:00
Ana Bozianu
92b9f4df4a 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
c444abb362 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02:00
Ana Bozianu
950c0028f3 RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Ana Bozianu
a0710a379a Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master' 
Feature/rm 4572 create record response contains wrong name

See merge request !12
 2017-02-07 14:53:36 +00:00
Ana Bozianu
161ec4eaee RM-4619 - replaced unit tests with integration tests 2017-02-07 16:24:10 +02:00
Ana Bozianu
21f232e450 RM-4572 - removed records id set in test as it is already set in a behavior 2017-01-06 12:13:14 +02:00
Tuna Aksoy
7a7986bfcd RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tuna Aksoy
058e3803fe RM-4570 (Update license headers) 2017-01-02 19:21:21 +00:00
Tuna Aksoy
a80d4a523e Updated license headers 2017-01-01 11:52:56 +00:00
Silviu Dinuta
b660169e6a Merge master into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 10:53:25 +02:00
Oana Nechiforescu
70ba4da0af Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge231ReleaseToMaster 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
 2016-11-16 17:33:33 +02:00
Silviu Dinuta
b192bd6d3f RM-4293: added integration test for testing special containers through 
java api
 2016-11-16 15:40:37 +02:00
Oana Nechiforescu
66873aa7e6 Merge remote-tracking branch 'origin/release/V2.4' into merge-2.5/Merge231ReleaseIn25 
# Conflicts:
#	rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
#	rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/category/DispositionBlock.java
#	rm-automation/src/main/java/org/alfresco/po/rm/details/record/RecordActionsPanel.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/DeleteRelationshipPrompt.java
#	rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/SelectRecordDialog.java
#	rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
#	rm-automation/src/main/java/org/alfresco/po/share/page/Message.java
#	rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
#	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/src/test/java/org/alfresco/test/TestData.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/BrowseClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/ClassifyRecord.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/EditClassification.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedDocuments.java
#	rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
 2016-11-15 18:04:48 +02:00
Oana Nechiforescu
6323c97f26 Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24 
# 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
 2016-11-14 17:17:45 +02:00
Silviu Dinuta
e8fd663859 Merge master into feature/RM-4327 2016-11-14 14:08:09 +02:00
Silviu Dinuta
9b0aa770f9 RM-4327: changed InvalidParameterException with IntegrityException 2016-11-10 16:58:05 +02:00
Tom Page
1efc9333e5 RM-2526, RM-4264 Merge release/V2.5 into master. 2016-11-10 14:02:56 +00:00
Tom Page
a75f2d4a1d RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Roxana Lucanu-Ghetu
ac8c7388d2 Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526 2016-11-08 17:35:25 +02:00
Ana Bozianu
5ad8cbde8d Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
Silviu Dinuta
e06b50f1f9 RM-4312: fixed some integration tests 2016-11-07 16:05:19 +02:00
Tom Page
035e5c630f RM-1039 Merge commit '92484a8' into master. 2016-10-31 16:16:51 +00:00
Tom Page
703108c159 RM-1039 Merge commit 'f20e02f' into origin/release/V2.5. 2016-10-31 09:55:28 +00:00
Mihai Cozma
f20e02ffed Merge commit '103734a' into release/V2.4 2016-10-28 14:48:20 +03:00
Tuna Aksoy
ded1bbef88 Merge branch 'master' into feature/RM-4012_Category_REST_API_2 2016-10-26 16:15:31 +01:00
Tom Page
6c51cad5be Merge release/V2.5 into master. 2016-10-25 14:22:15 +01:00
Tom Page
3604820810 RM-2526 Merge release/V2.4 into release/V2.5. 2016-10-25 10:28:13 +01:00
roxana
4f1ccefae2 I've tweaked the tests a bit to handle daylight savings. 
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
 2016-10-24 14:40:08 +01:00
Tom Page
5468461288 RM-2526 Fix location of MultipleSchedulesTest. 2016-10-24 14:07:39 +01:00
Ana Bozianu
7a33945dff fixed audit unit tests 2016-10-18 18:28:29 +03:00
Tom Page
970d1080e2 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tuna Aksoy
72afd52a1d Merge branch 'master' into feature/RM-4012_Category_REST_API 2016-10-12 08:45:08 +01:00
Tuna Aksoy
c97b1223d1 Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016 2016-10-11 20:21:21 +01:00
Tuna Aksoy
cf4dc8cbb1 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
 2016-10-11 17:00:35 +01:00
Tuna Aksoy
d25b0423fb Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
 2016-10-10 20:49:13 +01:00
Tom Page
2b125f7593 RM-2526 Remove unwanted extra copy of cherry-picked test file. 2016-10-10 15:20:45 +01:00
Tuna Aksoy
89513a7316 Merge branch 'master' into feature/RM-4012_Category_REST_API 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-enterprise/rm-enterprise-repo/pom.xml
 2016-10-09 16:21:15 +01:00
Tuna Aksoy
cdd02e9c13 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
 2016-10-07 14:40:39 +01:00
Tuna Aksoy
f0a83e23d1 Fixed failing integration and UI tests 2016-10-06 16:26:39 +01:00
Tuna Aksoy
feb9bc09c7 Temp workaround to fix the failing integration tests 2016-10-05 23:58:05 +01:00
Tuna Aksoy
524ec7ba84 Merge branch 'release/V2.5' into merge/MergeV25ToMaster 2016-10-05 21:56:11 +01:00
Tuna Aksoy
985c9d06b6 Merge branch 'feature-2.4/RM-4095_Fix_Failing_Integration_Test' into release/V2.4 2016-10-05 19:28:45 +01:00
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
 2016-10-05 15:20:19 +01:00
Tuna Aksoy
2db9730702 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
 2016-10-04 22:56:45 +01:00