Tuna Aksoy
4cb59970d0
RM-4570 (Update license headers)
2017-01-02 19:21:21 +00:00
Tuna Aksoy
3d7661746c
Updated license headers
2017-01-01 11:52:56 +00:00
Silviu Dinuta
93674c191d
Merge master into feature/RM-4293_RM_special_containers_can_be_deleted
2016-11-17 10:53:25 +02:00
Oana Nechiforescu
ad40d62807
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
f3626a28a8
RM-4293: added integration test for testing special containers through
...
java api
2016-11-16 15:40:37 +02:00
Oana Nechiforescu
a40fb40951
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
28b213a1ec
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
b713fd146b
Merge master into feature/RM-4327
2016-11-14 14:08:09 +02:00
Silviu Dinuta
7753ccad06
RM-4327: changed InvalidParameterException with IntegrityException
2016-11-10 16:58:05 +02:00
Tom Page
fdf6b2055c
RM-2526, RM-4264 Merge release/V2.5 into master.
2016-11-10 14:02:56 +00:00
Tom Page
4e6eae75a3
RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.
2016-11-10 10:52:59 +00:00
Roxana Lucanu-Ghetu
0cb9a8420c
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526
2016-11-08 17:35:25 +02:00
Ana Bozianu
4851c13c3c
Merge release/V2.5.0.x to release/V2.5
2016-11-07 17:18:23 +02:00
Silviu Dinuta
7112a6918c
RM-4312: fixed some integration tests
2016-11-07 16:05:19 +02:00
Tom Page
4a6c48ceb0
RM-1039 Merge commit '8d3a7f0' into master.
2016-10-31 16:16:51 +00:00
Tom Page
21f91bcb30
RM-1039 Merge commit '0143931' into origin/release/V2.5.
2016-10-31 09:55:28 +00:00
Mihai Cozma
01439318f6
Merge commit '41b25b3' into release/V2.4
2016-10-28 14:48:20 +03:00
Tuna Aksoy
6836596a22
Merge branch 'master' into feature/RM-4012_Category_REST_API_2
2016-10-26 16:15:31 +01:00
Tom Page
db7b1684a4
Merge release/V2.5 into master.
2016-10-25 14:22:15 +01:00
Tom Page
7731f4e245
RM-2526 Merge release/V2.4 into release/V2.5.
2016-10-25 10:28:13 +01:00
roxana
8f8b0268f2
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
05d14de22b
RM-2526 Fix location of MultipleSchedulesTest.
2016-10-24 14:07:39 +01:00
Ana Bozianu
e686da88de
fixed audit unit tests
2016-10-18 18:28:29 +03:00
Tom Page
a0e5ed3693
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tuna Aksoy
4ba9e64824
Merge branch 'master' into feature/RM-4012_Category_REST_API
2016-10-12 08:45:08 +01:00
Tuna Aksoy
d95c83df5a
Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016
2016-10-11 20:21:21 +01:00
Tuna Aksoy
0597d60f94
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
2dc520e898
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
d80be797b8
RM-2526 Remove unwanted extra copy of cherry-picked test file.
2016-10-10 15:20:45 +01:00
Tuna Aksoy
79b680e4e5
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
7ea10996f9
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
f934297f11
Fixed failing integration and UI tests
2016-10-06 16:26:39 +01:00
Tuna Aksoy
1928e120da
Temp workaround to fix the failing integration tests
2016-10-05 23:58:05 +01:00
Tuna Aksoy
8eff7635df
Merge branch 'release/V2.5' into merge/MergeV25ToMaster
2016-10-05 21:56:11 +01:00
Tuna Aksoy
9d02e0c768
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
b7311e28ac
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
f28ab68609
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
Roxana Lucanu-Ghetu
3be9d3718c
Merge branch 'feature-2.4/RM-3060' into 'release/V2.4'
...
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off
Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.
See merge request !157
(cherry picked from commit 7345f55384
2016-10-03 12:10:20 +03:00
Tuna Aksoy
13cfe5914d
RM-4095 (Fix failing tests after merging 2.3.0.x up to master)
2016-10-01 22:50:50 +01:00
Tom Page
483bb55a13
Let git handle line endings for us.
2016-09-23 14:36:49 +01:00
Tom Page
bbf9580519
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
Tuna Aksoy
9ecea8d44f
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:47:29 +01:00
Tuna Aksoy
b4298928bd
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:45:57 +01:00
Tuna Aksoy
96e9f8828f
Merge branch 'release/V2.3' into release/V2.4
...
Conflicts:
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
2016-09-22 10:39:50 +01:00
Tom Page
b08d4a788e
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Ana Bozianu
a249953a92
Merge 2.4 merge fix into 2.5
2016-09-21 15:56:06 +03:00
Ana Bozianu
16927d264c
fixed merge error
2016-09-21 15:40:27 +03:00
Ana Bozianu
0a084b2f60
Merge release/2.5 into master
2016-09-21 15:12:01 +03:00
Ana Bozianu
4d2fc69747
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
