Commit Graph

6805 Commits

Author SHA1 Message Date
Tom Page
0acdf8f060 Record-only merge V2.6.0.x into V2.6 2018-01-16 12:26:25 +00:00
Tom Page
b431447c68 Updating license header to 2018 2018-01-16 12:26:10 +00:00
Tom Page
8dc17d6bde Record-only merge V2.5 into V2.6 2018-01-16 12:21:25 +00:00
Tom Page
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
f4aefe8c33 Record-only merge V2.5.2.x into V2.5 2018-01-16 12:17:24 +00:00
Tom Page
33b879c071 Updating license header to 2018 2018-01-16 12:17:11 +00:00
Tom Page
8db9884b64 Record-only merge V2.5.1.x into V2.5 2018-01-16 12:13:26 +00:00
Tom Page
b1b9e2cf7b Updating license header to 2018 2018-01-16 12:13:12 +00:00
Tom Page
4da7eca576 Record-only merge V2.5.0.x into V2.5 2018-01-16 12:09:35 +00:00
Tom Page
491b1236bb Updating license header to 2018 2018-01-16 12:09:20 +00:00
Tom Page
ca23231913 Record-only merge V2.4 into V2.5 2018-01-16 12:05:53 +00:00
Tom Page
69ea393e63 Updating license header to 2018 2018-01-16 12:05:38 +00:00
Tom Page
50008360b5 Record-only merge V2.4.0.x into V2.4 2018-01-16 12:02:53 +00:00
Tom Page
8cdd6861db Updating license header to 2018 2018-01-16 12:02:40 +00:00
Tom Page
5c8dc36663 Merge branch 'feature/VariousSonarFixes' into 'master'
Various fixes based on issues found by Sonar

See merge request records-management/records-management!773
2018-01-15 15:49:27 +00:00
Sara Aspery
f9a08391e9 RM-5927 Fix v21 appliesFromVersion to 2.0 2018-01-13 01:01:54 +00:00
Tom Page
acae374a35 Add debug log message if exceptions are swallowed.
Fix a couple of minor issues in DynamicAuthoritiesGet webscript.
2018-01-12 15:25:56 +00:00
Tom Page
bc07bbfb44 Replace a few RuntimeExceptions with AlfrescoRuntimeExceptions. 2018-01-12 14:54:51 +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
Brian Remmington
c4b5dee64e RM-5996: Removed empty pages for clarity. 2018-01-12 09:03:46 +00:00
Sara Aspery
f7e0c28eb5 RM-5927 Fix appliesToVersion to 2.0.999 2018-01-11 14:57:33 +00:00
Sara Aspery
97f7ca3b64 RM-5927 Fix appliesToVersion to 2.x.999 2018-01-11 14:56:34 +00:00
Brian Remmington
72a0ff4c8a RM-5996: Added component diagram to the overview page. 2018-01-11 13:29:13 +00:00
Brian Remmington
337627d5dc RM-5996: Removed design docs for security marks and content classification from the community code. 2018-01-11 13:16:41 +00:00
Brian Remmington
1f2b2dca52 A fairly dumb initial copy of RM-related design information from the Architecture Map 2018-01-11 12:23:09 +00:00
Tom Page
f7e98b5df2 Simplify inequality check as suggested in code review. 2018-01-08 08:34:42 +00:00
Tom Page
496b2ca208 Fix some issues raised by Sonar.
Avoid NPE if calculateListOfEmptyFolders returns null in ScheduleXRecordLoaders.

Fix equals method of a few classes to check against the other instance.

Make synchonisation consistent in AppliedSourceServiceImpl and also remove a
redundant null check.

Use Arrays.toString to make a more readable string representation of an array.

Combine a few if statement branches that do the same thing.
2018-01-05 16:19:33 +00:00
Sara Aspery
2bc9c284e7 RM-5927 Add appliesToVersion to v20 v21 patches 2018-01-05 11:41:19 +00:00
Jelena Cule
ffca8d3dc1 Merge branch 'feature/RM-5917_ClassificationSourceReference_API_TESTS_2' into 'master'
Merge RM-5917 ClassificationSourceReference API TESTS to master

See merge request records-management/records-management!731
2018-01-05 10:41:35 +00:00
Jelena Cule
1ee4e1d5aa Merge RM-5917 ClassificationSourceReference API TESTS to master 2018-01-05 10:41:35 +00:00
Tom Page
1ea0b9fccf 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
00517a13c4 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
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
Elena Hardon
f75e76ed22 Merge branch 'feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp' into 'master'
Solved issue and added integration test

See merge request records-management/records-management!755
2018-01-04 08:56:54 +00:00
Elena Hardon
4d6eaf798b RM-5970 - Added javadoc on the class and repaired typo 2018-01-03 16:05:40 +02:00
Elena Hardon
a81e822b46 Merge branch 'master' into feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp 2018-01-03 12:13:53 +02:00
Ana Bozianu
7ac26e255d Merge branch 'feature/UpdateHeadersTo2018' into 'master'
update headers to 2018

See merge request records-management/records-management!756
2018-01-03 10:12:16 +00:00
Elena Hardon
42e92b52fb RM-5970 - Added header for the integration test for copy to action 2018-01-03 12:10:20 +02:00
Ana Manolache
4a145de54e update headers to 2018 2018-01-03 12:01:00 +02:00
Elena Hardon
ab42ad19d5 RM-5970 - Added integration test for copy to action 2017-12-27 13:15:13 +02:00
Elena Hardon
e54ab8dcea 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
695a5e600a Merge release/V2.6 into master. 2017-12-19 10:27:34 +00:00
Tom Page
dd613e9492 Merge release/V2.5 into release/V2.6. 2017-12-19 10:26:22 +00:00
Tom Page
8c150529ca Merge release/V2.5.2.x into release/V2.5. 2017-12-19 10:20:48 +00:00
Tom Page
785ce90dd0 Revert community pom change "Fix h2scripts version..."
This partially reverts commit 0c5c9a081a.
2017-12-18 15:24:36 +00:00
alfresco-build
0888913598 [maven-release-plugin] prepare for next development iteration 2017-12-15 16:59:26 +00:00
alfresco-build
4f6855da72 [maven-release-plugin] prepare release V2.5.2.1 2017-12-15 16:59:24 +00:00
Sara Aspery
5497066619 Merge branch 'hotfix-2.5/MNT-18771­PublishJobUpgradeError' into 'release/V2.5.2.x'
MNT-18771 Publish Job Upgrade Error

See merge request records-management/records-management!745
2017-12-14 14:24:03 +00:00
cagache
8a4dd07b7a Merge remote-tracking branch 'origin/release/v2.6' 2017-12-13 10:01:14 +02:00
cagache
6195140890 Merge remote-tracking branch 'origin/release/v2.5' into release/V2.6 2017-12-13 09:53:02 +02:00