Commit Graph

233 Commits

Author SHA1 Message Date
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
Sara Aspery
36d26c5c97 RM-6353 Fix Yaml Unit Test 2018-05-28 19:32:24 +01:00
Rodica Sutu
6a42037f90 comment the check from BaseYamlUnitTest.java until we fix RM-6353 2018-05-23 11:51:27 +03:00
Ross Gale
888157199d search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
504d85e8d3 Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00
Ross Gale
09ebad77d1 remove unused field from test 2018-04-11 18:06:01 +01:00
Ross Gale
44bed4a796 RM-6137 Add record category identifier to search changes added 2018-04-10 17:11:26 +01: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
Tom Page
96e3b8d1b2 RM-6080 Use system user to handle metadata node.
This allows an rm admin user to classify record folders and their children.
2018-02-16 11:10:17 +00:00
Roxana Lucanu-Ghetu
4c42b2cdf6 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +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
20edcae7c4 A couple of minor fixes.
Fix method signature to refer to the precise exception thrown.

Use Instant from Java 8 rather than DateUtils.truncate.
2018-01-12 14:13:05 +00:00
Tom Page
29e00d1ec2 RM-5344 Only gather DOD audit entries if there is a DOD RM site.
This creates an edge case where DOD audit entries are no longer displayed
if a DOD RM site is deleted and then a standard RM site is created to
replace it. However this seems like an unlikely use case, and there is a
workaround of exporting the audit log before deleting the DOD RM site.

Two audit queries are still made for DOD RM sites because DOD sites cause
some standard audit entries to be created (e.g. the holds container
created event, etc.).
2018-01-04 12:08:01 +00:00
Ana Manolache
f908442af2 update headers to 2018 2018-01-03 12:01:00 +02:00
Ross Gale
88ac5834c9 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
Ross Gale
b0cc81fc2c Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Ana Bozianu
3c72bbc0f9 MNT-18502 - filtered out dod properties if the node is not a dod record 2017-12-08 07:53:22 +00:00
Ross Gale
ea4b979a5f Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00