Roxana Lucanu
59e0979070
RM-7065 merge to v2.7
2020-01-27 11:12:48 +02:00
Roxana Lucanu
b2011a8a52
Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"
...
This reverts merge request !1353
2020-01-27 08:43:09 +00:00
Roxana Lucanu
db4dc1f016
Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822
2020-01-20 12:44:41 +02:00
Roxana Lucanu
25d400d3b5
Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5'
...
RM-7065 Add write transaction in a read only one for creating a node
See merge request records-management/records-management!1344
2020-01-14 19:02:48 +02:00
Sara Aspery
b48d31457a
Update license headers
2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5
Merge branch 'release/V2.6' into release/V2.7
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10
Update license headers
2020-01-02 13:57:59 +00:00
Roxana Lucanu
6035370684
Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect
2019-12-04 15:44:29 +02:00
Roxana Lucanu
8d5ff56f8f
Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect
2019-12-03 11:58:42 +02:00
Roxana Lucanu
f138d31436
RM-7060 Fix integration tests
2019-11-27 11:28:32 +02:00
Roy Wetherall
1c539f9f05
Fix issue with inaccurate results returning from content URL query
...
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
2019-08-29 12:28:04 +10:00
Roy Wetherall
211ebba2f2
Add logging to rm query DAO implementation
2019-08-29 09:50:57 +10:00
Rodica Sutu
cc3f72cfaf
Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6
2019-02-25 09:19:23 +02:00
cagache
ab762cf8f5
addressed code review comments
2019-02-18 10:57:16 +02:00
cagache
01f7bc013d
fixed failing tests
2019-02-14 16:22:57 +02:00
Ross Gale
a0575dbc8a
RM-6702 updating headers to 2019
2019-01-04 10:11:45 +00:00
Ross Gale
cabc902203
RM-6702 updating headers to 2019
2019-01-03 14:30:44 +00:00
Ross Gale
bc6b9741ad
RM-6702 Updating licence headers
2019-01-03 09:23:49 +00:00
Rodica Sutu
68433857c7
integration test for create user event
2018-04-23 17:39:13 +03:00
Rodica Sutu
9d6bdeaa8b
review changes
2018-03-23 17:28:21 +02:00
Rodica Sutu
d009244189
test to cover the audit event for user deletion
2018-03-23 08:59:29 +02:00
Rodica Sutu
7b7948ccb4
Merge branch 'merge-2.6/FixesFrom2.5' into merge/RM-6069_MergeFrom2.6ToMaster
...
# Conflicts:
# rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
# rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/ClassifyRecord.java
# rm-automation/rm-automation-ui/src/test/resources/smokeTests.xml
# rm-automation/rm-automation-ui/src/test/resources/testng.xml
2018-02-27 15:35:44 +02:00
Rodica Sutu
d11efb8c77
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5
...
# Conflicts:
# rm-automation/pom.xml
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
# rm-enterprise/pom.xml
2018-02-24 21:48:16 +02:00
Elena Hardon
f1e3c0b853
MNT-19114 - Made review changes
2018-02-19 13:40:52 +02:00
Elena Hardon
b581d58726
MNT-19114: Removed unused comments
2018-02-16 16:08:18 +02:00
Elena Hardon
0da89c011c
MNT-19114 - Added integration test which shows that wiki pages can now be created as immediate folder type children under RM site
2018-02-16 16:07:18 +02:00
Rodica Sutu
0dfc32fc15
review updates - minor formatting, update java docs
2018-01-29 09:29:08 +02:00
Rodica Sutu
0167d75c44
updates after review:
...
update the getChildrenPropertyValues return type
update the existing tests from RecordsManagementQueryDAOImplTest that test getChildrenPropertyValues() method
2018-01-26 16:48:38 +02:00
Rodica Sutu
245ffee3e0
modify the hasChildrenWithPropertyValues to getChildrenPropertyValues in order to return the query result
...
update the implementation where the modified method is used
update tests
2018-01-26 10:57:49 +02:00
Tom Page
0268299006
Updating license header to 2018
2018-01-16 12:31:06 +00:00
Tom Page
350a198837
Updating license header to 2018
2018-01-16 12:21:10 +00:00
Tom Page
d46ff0b2dd
Merge branch 'feature/RM-5344_DODAuditQuery_fp' into 'master'
...
RM-5344 Only gather DOD audit entries if there is a DOD RM site.
See merge request records-management/records-management!759
2018-01-05 08:19:57 +00:00
Tom Page
77b5d35685
RM-5344 Handle case where site with id "rm" doesn't exist.
...
This is not possible normally, but it does happen with the integration tests.
Also fix some whitespace in the test class.
2018-01-04 14:38:57 +00:00
Elena Hardon
4540456eb8
RM-5970 - Added javadoc on the class and repaired typo
2018-01-03 16:05:40 +02:00
Elena Hardon
1cb87e7d6c
Merge branch 'master' into feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp
2018-01-03 12:13:53 +02:00
Elena Hardon
19dc1d9c55
RM-5970 - Added header for the integration test for copy to action
2018-01-03 12:10:20 +02:00
Ana Manolache
f908442af2
update headers to 2018
2018-01-03 12:01:00 +02:00
Elena Hardon
94594d0b15
RM-5970 - Added integration test for copy to action
2017-12-27 13:15:13 +02:00
Ana Bozianu
e6a54af4a7
RM-5617 - added integration test and fixed small issues discovered in the process
2017-10-24 17:30:39 +03:00
Ramona Popa
da7551dcf2
RM-5647 - one more integration test + some fix & refactor
2017-10-03 17:21:34 +03:00
Ramona Popa
06c47adc0e
Merge branch 'feature/RM-5639_PreventClassificationBeyondParent_JavaAPI' into feature/RM-5647_PreventClassifedItemsBeingMoved_JavaApi
2017-10-03 16:02:21 +03:00
Ramona Popa
c814258e80
RM-5647 - added java api functionality and some integration tests
2017-10-03 12:13:16 +03:00
Ana Bozianu
f639b59831
RM-5655 - moved the query in community
2017-09-28 09:17:56 +03:00
Ross Gale
01f1aae3f5
RM-5612 Changing versions and fixing failing tests
2017-09-07 10:33:56 +01:00
Tom Page
88a3c42750
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Ramona Popa
1eb4e09a83
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Sara Aspery
fb215876b8
fixing IDE whitespaces
2017-06-24 22:49:27 +01:00
Sara Aspery
80434ce57e
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-23 16:40:00 +01:00
Tuna Aksoy
fe44da1abe
Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
2017-06-20 16:07:26 +01:00
Sara Aspery
57b3460b58
include_declare_record_refactoring_in_Rest
2017-06-20 11:12:22 +01:00
