Commit Graph

1278 Commits

Author SHA1 Message Date
Sara Aspery
4972188311 RM-5927 Add appliesToVersion to v20 v21 patches 2018-01-05 11:41:19 +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
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
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
Elena Hardon
5fd6602038 RM-5970 - Removed onCopyComplete method from RecordComponentIdentifierAspect because it was overwriting the existing unique id for a record on copy to action 2017-12-21 10:58:30 +02:00
Tom Page
a0e770052b Merge release/V2.6 into master. 2017-12-19 10:27:34 +00:00
Tom Page
01961c2382 Merge release/V2.5 into release/V2.6. 2017-12-19 10:26:22 +00:00
Tom Page
ebfee294df Merge release/V2.5.2.x into release/V2.5. 2017-12-19 10:20:48 +00:00
Tom Page
81d3e9e322 Revert community pom change "Fix h2scripts version..."
This partially reverts commit 1707339d68.
2017-12-18 15:24:36 +00:00
alfresco-build
49b5218b6f [maven-release-plugin] prepare for next development iteration 2017-12-15 16:59:26 +00:00
alfresco-build
6d75cdcab6 [maven-release-plugin] prepare release V2.5.2.1 2017-12-15 16:59:24 +00:00
cagache
2826521209 Merge branch 'release/V2.6' 2017-12-12 13:23:29 +02:00
Tom Page
06eb2c6ff9 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
Ross Gale
88ac5834c9 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
cagache
abbf091bc7 Merge remote-tracking branch 'origin/release/v2.4' into merge-2.5/RM-5882_ShareLiveSearch 2017-12-11 16:01:28 +02:00
Tom Page
51b11d09cf RM-5878 Move live-search.lib.js to the correct place. 2017-12-11 13:35:39 +00:00
Ross Gale
b0cc81fc2c Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Tom Page
526f689e64 Merge release/V2.4 into release/V2.5. 2017-12-11 10:44:14 +00:00
Sara Aspery
defcb53c70 MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00
Tom Page
1707339d68 Fix h2scripts version using same method as on master.
Without this change we can no longer start RM using the maven command.
2017-12-08 16:30:05 +00:00
Ross Gale
24f6fedc24 RM-5883 adding updated schema number to ensure patch runs in later upgrades, including break command to ensure patch will only run once 2017-12-08 14:49:47 +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
David Webster
a265daf8f1 Merge branch 'feature/RM-5900-document-extended-permission-service_no' into 'master'
Feature/rm 5900 document extended permission service no

See merge request !700
2017-12-06 10:59:28 +00:00
David Webster
51a47c56c4 Documentation updates following review 2017-12-06 09:50:50 +00:00
Ross Gale
c8932192f9 RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Ana Bozianu
a36e1773af Merge remote-tracking branch 'origin/merge-2.6/MNT-18793' into merge/MNT-18793 2017-11-27 15:17:16 +02:00
Ana Bozianu
915e99394c 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
4fcfdb164e Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
alfresco-build
d9b6c0d6f5 [maven-release-plugin] prepare for next development iteration 2017-11-27 10:37:48 +00:00
alfresco-build
020b2a6c38 [maven-release-plugin] prepare release V2.5.0.5 2017-11-27 10:37:45 +00:00
Ana Bozianu
33af594d47 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
David Webster
31b4115209 RM-5900: minor link updates 2017-11-24 12:47:03 +00:00
David Webster
a3c5fc26f0 RM-5900: minor link updates 2017-11-24 12:43:35 +00:00
David Webster
d3ba4d89a2 RM-5900: Document Extended Permission Service. 2017-11-24 12:37:49 +00:00
Rodica Sutu
8765349a80 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
75469a0f5b MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Tom Page
7af2e0430b RM-5875 Manage the version of guava from the root pom.
We'll need to use the regression tests to check that upgrading guava like this
doesn't break anything in the application, but it fixes the unit tests.
2017-11-22 09:10:44 +00:00
Sara Aspery
38a6134ce8 Merge branch 'feature-2.6/RM-5901_SonarIssuesEmptyCollectionTest' into feature/RM-5901_SonarIssuesEmptyCollectionTest 2017-11-20 15:34:28 +00:00
Sara Aspery
7165c0d95e RM-5901 review changes 2017-11-20 15:14:53 +00:00
Sara Aspery
3a1db54876 RM-5875 review changes 2017-11-20 07:39:37 +00:00
Sara Aspery
de4f99d26b RM-5875 add license header 2017-11-17 16:40:07 +00:00
Sara Aspery
dd89c7d2f2 RM-5901 fixes in benchmark driver 2017-11-16 18:15:59 +00:00
Sara Aspery
34b863ff16 RM-5901 fixes in community repo 2017-11-16 17:59:02 +00:00
Sara Aspery
1866aaaa49 Merge branch 'release/V2.6' into feature-2.6/RM-5875_YamlFileUnitTest_no 2017-11-16 16:35:08 +00:00