inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 335 Branches 2,191 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

6805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ross Gale
e227da1fd1 Revert "RM-5931 Adding transaction fix for integration test" 
This reverts commit 3f5363351e
 2017-12-06 16:35:06 +00:00
Ross Gale
afe7f15823 Revert "RM-5931 Adding transaction fix for integration test" 
This reverts commit 96e53ff363
 2017-12-06 16:34:49 +00:00
Ross Gale
7c786e3c7f Revert "Merge branch 'release/V2.3' of…" 
This reverts commit 847f759cc4
 2017-12-06 16:34:33 +00:00
Ross Gale
847f759cc4 Merge branch 'release/V2.3' of git.alfresco.com:records-management/records-management into release/V2.3 2017-12-06 15:58:22 +00:00
Ross Gale
96e53ff363 RM-5931 Adding transaction fix for integration test 2017-12-06 15:57:39 +00:00
Tom Page
7c8c6098dd Revert "Revert "Update Alfresco dependency to 5.0.4."" 
This reverts commit 6d8a273e27.
 2017-12-06 14:40:00 +00:00
Ross Gale
3f5363351e RM-5931 Adding transaction fix for integration test 2017-12-06 14:28:26 +00:00
Ross Gale
caa99535a1 Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
David Webster
a2c5e81bbc 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
Ross Gale
01dbdc04a7 Merge branch 'feature-2.4/MNT-2.4_MERGE' into 'release/V2.4' 
RM-5878 mnt changes added to a 2.4 branch

See merge request !717
 2017-12-06 10:09:01 +00:00
Richard Smith
10cc24b1a8 RM-5878: Replace ~/slingshot/search/live-search.lib.js in RM to exclude RM specific document types from live search results. 2017-12-06 10:04:25 +00:00
David Webster
dafb2165de Documentation updates following review 2017-12-06 09:50:50 +00:00
Tom Page
6d8a273e27 Revert "Update Alfresco dependency to 5.0.4." 
This reverts commit 6866c7d5ad.
 2017-12-06 09:33:02 +00:00
Ross Gale
f70ad4df3e RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Tom Page
8a2d931267 Revert "Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'"" 
This reverts commit dc2c1d9aee.
 2017-12-05 14:37:07 +00:00
Tom Page
dc2c1d9aee Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'" 
This reverts commit f8b9e86bcb, reversing
changes made to d8da2251e6.
 2017-12-05 14:36:38 +00:00
Tom Page
2e0a194042 Merge release/V2.6 into master. 2017-12-05 10:20:50 +00:00