Commit Graph

224 Commits

Author SHA1 Message Date
cagache
045f19f8d9 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix
# Conflicts:
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
2019-09-03 10:10:18 +03:00
Roy Wetherall
e282c0584e 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
Sara Aspery
ecbaa3b40c MNT-20740 New db query 2019-08-22 11:19:34 +01:00
Sara Aspery
e5bb53b686 MNT-20740 Updates from review 2019-08-05 10:20:38 +01:00
Sara Aspery
640ddc95f9 MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00
cagache
d645c19e37 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
3dc65aaed5 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
Rodica Sutu
4934fa5634 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
c9d1453025 RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
Ross Gale
0c2833a5a2 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
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
8d97d12f88 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
Rodica Sutu
eafe3ebf30 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
475164672e 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
33570a80da addressed code review comments 2019-02-19 09:37:36 +02:00
cagache
adbed03427 addressed code review comments 2019-02-18 17:08:05 +02:00
cagache
dfb473eef6 added unit tests 2019-02-18 15:16:48 +02:00
Ross Gale
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Sara Aspery
f6f33492db 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
1ed99b5cf4 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00
Sara Aspery
2a275f3984 RM-6353 Fix Yaml Unit Test 2018-05-28 19:32:24 +01:00
Rodica Sutu
9f44f7b467 comment the check from BaseYamlUnitTest.java until we fix RM-6353 2018-05-23 11:51:27 +03:00
Ross Gale
e9d42bfeef search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
e11bef00bb Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00
Ross Gale
fdaf2f9b61 remove unused field from test 2018-04-11 18:06:01 +01:00
Ross Gale
522abe1ee9 RM-6137 Add record category identifier to search changes added 2018-04-10 17:11:26 +01:00
Rodica Sutu
c06ecabb17 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
297af07a32 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
c3ed37b8ce 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
ee62eb74d8 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +02:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
965d86508e 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
db72233b70 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
4a145de54e update headers to 2018 2018-01-03 12:01:00 +02:00
Ross Gale
ecc5e281e3 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
Ross Gale
f21bed1e01 Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Ana Bozianu
f45d952217 MNT-18502 - filtered out dod properties if the node is not a dod record 2017-12-08 07:53:22 +00:00
Ross Gale
caa99535a1 Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
Ross Gale
f70ad4df3e RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Ana Bozianu
d8da2251e6 Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793 2017-11-27 15:15:03 +02:00
Ana Bozianu
895e863f11 Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Ana Bozianu
0f62fbe006 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
Rodica Sutu
1f6e2c1c6f Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x 2017-11-24 09:51:59 +02:00
Ana Bozianu
0fbe36eaa3 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Sara Aspery
31b7c57afb RM-5875 review changes 2017-11-20 07:39:37 +00:00
Sara Aspery
52bcb28446 RM-5875 add license header 2017-11-17 16:40:07 +00:00
Sara Aspery
5e3692ff60 RM-5875 add Swagger version to exception message 2017-11-16 09:51:13 +00:00