Commit Graph

252 Commits

Author SHA1 Message Date
cagache
bee8d09bd4 Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 16:54:58 +03:00
Ross Gale
6437f31749 RM-6873 adding code review changes 2019-08-20 13:56:14 +01:00
cagache
d990f30e8c Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 08:09:32 +03:00
Ross Gale
ac4b8d4b9a RM-6873 adding changes from update branch and updating tests 2019-08-19 15:56:10 +01:00
cagache
3dfc01f716 Added check for Remove From Hold capability 2019-08-19 09:32:33 +03:00
cagache
221a633c2a Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-16 09:44:56 +03:00
Ross Gale
1d739008c2 RM-6873 adding unit tests for edit 2019-08-16 07:25:19 +01:00
cagache
f972c54efb Moved instanceOf method from ServiceBaseImpl class to a utility class 2019-08-14 17:04:04 +03:00
cagache
947b293c76 Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-14 15:22:27 +03:00
Ross Gale
dff5b452d9 RM-6873 code review changes 2019-08-14 11:20:18 +01:00
cagache
c3021ccfa1 Do not allow addition of locked content to holds 2019-08-13 17:10:06 +03:00
cagache
8fc0ca7e5a Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-09 12:53:03 +03:00
cagache
2f88cee847 Add active content to hold through rest api 2019-08-09 12:07:24 +03:00
Ross Gale
d5278c4ec7 RM-6873 adding code to allow for the removal of active content from a hold 2019-08-09 10:06:30 +01:00
cagache
66706abac5 code review comments 2019-08-06 13:45:53 +03:00
cagache
53f75085a5 Added check for archived nodes 2019-08-05 16:40:26 +03:00
cagache
2fd1f661e2 code review comments 2019-08-02 17:31:02 +03:00
cagache
820d1b2c0d Added IT and unit tests for add file to hold 2019-07-25 17:51:17 +03:00
cagache
f61992f047 Allow active content to be added to a hold 2019-07-23 15:45:23 +03:00
cagache
cd76665548 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6892_SonarFixes 2019-07-04 09:47:50 +03:00
cagache
da33dc1ae1 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
6bc4ec03a6 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
Ross Gale
62b7426b73 RM-6869 code comment changes 2019-06-05 09:07:35 +01:00
Ross Gale
76c865e41a RM-6869 removing linked record during rejection 2019-06-03 11:10:16 +01:00
Sara Aspery
e0e2e94b21 Merge branch 'feature/RM-6852_FixInconsistenciesV1ResponeCodes' into 'feature/RM-6851_DeclareAndFileRecInHoldFolder'
Resolve RM-6852 "Feature/ fixinconsistenciesv1responsecodes"

See merge request records-management/records-management!1179
2019-05-23 21:24:40 +01:00
Sara Aspery
dc2e6f9f57 RM-6851 updates from review 2019-05-23 15:17:04 +01:00
Sara Aspery
48469d8ce9 RM-6852 Fix inconsistencies in V1 response codes 2019-05-23 12:44:20 +01:00
Sara Aspery
16ef2130a8 RM-6851 Fix declare record into hold - add unit test 2019-05-23 12:32:01 +01:00
cagache
021804e79a code review comments 2019-05-22 17:04:18 +03:00
cagache
c1470c7c38 Merge remote-tracking branch 'remotes/origin/feature/RM-6796_DeclareAndFileTests' into feature/RM-6849_CheckForFilingPermission 2019-05-21 16:55:51 +03:00
Sara Aspery
8aeaf91926 RM-6792 review - change unfiled folder to container 2019-05-21 12:39:46 +01:00
cagache
c47cd6f44e Updated javadoc 2019-05-21 12:10:45 +03:00
cagache
2bb72a4a59 Added check for filling permission on destination record folder 2019-05-20 17:02:05 +03:00
Sara Aspery
a2103168d8 RM-6792 updates from review 1 2019-05-16 10:44:29 +01:00
Sara Aspery
2c30614e8c RM-6792 Optional Record Locn 2019-04-24 11:42:42 +01:00
Rodica Sutu
bb93c0ad4e Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
2019-04-09 10:51:44 +03:00
Ross Gale
c551042eca RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
Ross Gale
9baac01d03 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Ross Gale
ed8f24865c RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
8bf3cdf913 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
Rodica Sutu
c96f9ae280 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02: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
fb02ac0afa addressed code review comments 2019-02-19 09:37:36 +02:00
cagache
db47a2f6f2 addressed code review comments 2019-02-18 17:08:05 +02:00
cagache
a5629acc2a added unit tests 2019-02-18 15:16:48 +02:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00: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
Sara Aspery
1a8d563140 Merge branch 'xperimental/RM6353_FixYamlUnitTest_no' into 'xperimental/RM-6313UpgradeRMSchedulers'
RM-6353 Fix Yaml Unit Test

See merge request records-management/records-management!1015
2018-05-29 11:38:58 +01:00
Rodica Sutu
9500e00f09 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00