inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,522 Commits 324 Branches 2,170 Tags
b42ef56d9e781d7644fce9c2c4f7e06cc4010d1c
Commit Graph

4522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cagache
e64422dab7 Merge branch 'release/V2.6' 2017-12-12 13:23:29 +02:00
cagache
323d11872a updated header 2017-12-12 09:46:06 +02:00
cagache
4e0030b702 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
eae9ffcec6 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
Ross Gale
ecc5e281e3 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
Ross Gale
f4e1ebb114 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
a63c74fd39 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
86411f825f RM-5878 Move live-search.lib.js to the correct place. 2017-12-11 13:35:39 +00:00
cagache
31126d45a6 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
ec6c956a3e 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
f21bed1e01 Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Tom Page
eadb2745c3 Merge release/V2.4 into release/V2.5. 2017-12-11 10:44:14 +00:00
Tom Page
5a0bca436f Record-only merge release/V2.3 into release/V2.4. 2017-12-11 10:37:46 +00:00
Tom Page
399eb08c7d Merge commit 'd9bc8a0' into feature-2.5/SavedSearchMerge. 2017-12-11 10:27:14 +00:00
Tom Page
5860d969c0 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
9aa8efd3dc 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
3e84f37def 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 10cc24b)
 2017-12-09 06:31:30 +02:00
Sara Aspery
eca2c62f9d MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00
Tom Page
5eefe40b9f 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
cd7abdae90 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
0c5c9a081a 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
89e9032a14 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
61021aa0f9 Merge release/V2.6 into master. 2017-12-08 09:25:53 +00:00
Tom Page
80cb813886 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
b2b1b87521 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
5bba1b6531 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
f45d952217 MNT-18502 - filtered out dod properties if the node is not a dod record 2017-12-08 07:53:22 +00:00
Tom Page
5f5773c617 Merge release/V2.3 into release/V2.4. 2017-12-07 14:10:45 +00:00
Ross Gale
d9bc8a0221 Merge commit '67eedec' into release/V2.4 2017-12-07 14:07:12 +00:00
Tom Page
ae2cdaac55 Record-only merge release/V2.3.2.x into release/V2.3. 2017-12-07 12:16:30 +00:00
Tom Page
08aa2449ac Update version to 2.3.2.1-SNAPSHOT. 2017-12-07 09:16:05 +00:00
Tom Page
a45f2fe3f0 Update version to 2.3.3-SNAPSHOT. 2017-12-07 08:37:21 +00:00
Tom Page
880dd0b976 Update version to 2.3.2. 2017-12-07 08:36:45 +00:00