Commit Graph

5622 Commits

Author SHA1 Message Date
Elena Hardon
d7088d1a29 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
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
Ana Bozianu
9ab406504e 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
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 ags-2.5.2.1 2017-12-15 16:59:24 +00:00
Sara Aspery
6c5ba7f7ca 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
a66de5c3e9 Merge remote-tracking branch 'origin/release/v2.6' 2017-12-13 10:01:14 +02:00
cagache
2e5c4f94a9 Merge remote-tracking branch 'origin/release/v2.5' into release/V2.6 2017-12-13 09:53:02 +02:00
cagache
2826521209 Merge branch 'release/V2.6' 2017-12-12 13:23:29 +02:00
cagache
9e498bd8fe updated header 2017-12-12 09:46:06 +02:00
cagache
c8da8c9081 automated AC for MNT-15575, regarding share live search for words from RM Saved Searches
(cherry picked from commit a33cb6e)
2017-12-12 09:32:07 +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
Ross Gale
6152207725 Merge branch 'merge-2.6/2.3.2' into 'release/V2.6'
merging from 2.5

See merge request records-management/records-management!736
2017-12-11 15:02:42 +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
cagache
5a5586aab0 automated AC for MNT-15575, regarding share live search for words from RM Saved Searches
(cherry picked from commit a33cb6e)
2017-12-11 13:13:51 +02:00
Tom Page
768a002ca1 RM-5878 Update the live search lib file with the 5.2 version.
Keep the changes to exclude RM saved searches.
2017-12-11 10:50:23 +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
Tom Page
3383e4c93f Record-only merge release/V2.3 into release/V2.4. 2017-12-11 10:37:46 +00:00
Tom Page
c9bb15242b Merge commit 'b151bc2' into feature-2.5/SavedSearchMerge. 2017-12-11 10:27:14 +00:00
Tom Page
94d9c75635 Merge branch 'merge-2.4/RM-5878_LiveSearchLib' into 'release/V2.4'
RM-5878 Live Search fix

See merge request records-management/records-management!729
2017-12-11 08:16:25 +00:00
Claudia Agache
5e45c444ac Merge branch 'feature-2.3/RM-5878_ShareLiveSearch' into 'release/V2.3'
Automated test for Share Live Search MNT

See merge request records-management/records-management!721
2017-12-11 07:23:41 +00:00
Richard Smith
0321b5b8d3 RM-5878: Replace ~/slingshot/search/live-search.lib.js in RM to exclude RM specific document types from live search results.
(cherry picked from commit ce1e6fe)
2017-12-09 06:31:30 +02:00
Sara Aspery
defcb53c70 MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00
Tom Page
5461e9932a Record-only merge release/V2.3 into release/V2.4.
The commits were some changes that were then reverted and the version
update for the release of V2.3.2.
2017-12-08 16:34:11 +00:00
Tom Page
2c6d34d595 Merge release/V2.3 into release/V2.4.
The live-search.lib.js file is unchanged in Share 5.1.
2017-12-08 16:31:18 +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
Tom Page
ab3fa87fa1 Merge release/V2.6 into master. 2017-12-08 09:25:53 +00:00
Tom Page
87f69c3e2f Merge branch 'feature-2.6/RM-5132_AutomationChanges' into 'release/V2.6'
RM-5132 Merge automation changes to release/V2.6.

See merge request records-management/records-management!723
2017-12-08 08:34:19 +00:00
Tom Page
48e5a6d852 Merge branch 'merge/RM-5132_AutomationChanges' into 'master'
Merge/rm 5132 automation changes

See merge request records-management/records-management!713
2017-12-08 08:29:05 +00:00
Ana Bozianu
78e9a234f9 Merge branch 'feature/MNT-18502_DODPropertiesOnEMLNodes_no' into 'master'
MNT-18502 - filtered out dod properties if the node is not a dod record

See merge request records-management/records-management!715
2017-12-08 07:53:22 +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
Tom Page
b58d04c9c7 Merge release/V2.3 into release/V2.4. 2017-12-07 14:10:45 +00:00
Ross Gale
b151bc26d8 Merge commit '3ce7ed8' into release/V2.4 2017-12-07 14:07:12 +00:00
Tom Page
09cf94d1ad Record-only merge release/V2.3.2.x into release/V2.3. 2017-12-07 12:16:30 +00:00
Tom Page
7abcb683dd Update version to 2.3.2.1-SNAPSHOT. 2017-12-07 09:16:05 +00:00
Tom Page
3ac76ed95e Update version to 2.3.3-SNAPSHOT. 2017-12-07 08:37:21 +00:00
Tom Page
b80b1647a3 Update version to 2.3.2. 2017-12-07 08:36:45 +00:00