inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 325 Branches 2,188 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ross Gale
a4f55a4a45 Revert "RM-5931 Adding transaction fix for integration test" 
This reverts commit 56dc5edfa7
 2017-12-06 16:35:06 +00:00
Ross Gale
5804a62855 Revert "RM-5931 Adding transaction fix for integration test" 
This reverts commit 826d6e7610
 2017-12-06 16:34:49 +00:00
Ross Gale
18c954f4d4 Revert "Merge branch 'release/V2.3' of…" 
This reverts commit aed60aad03
 2017-12-06 16:34:33 +00:00
Ross Gale
aed60aad03 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
826d6e7610 RM-5931 Adding transaction fix for integration test 2017-12-06 15:57:39 +00:00
Tom Page
bee7149e8b Revert "Revert "Update Alfresco dependency to 5.0.4."" 
This reverts commit eb935954e9.
 2017-12-06 14:40:00 +00:00
Ross Gale
56dc5edfa7 RM-5931 Adding transaction fix for integration test 2017-12-06 14:28:26 +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
Ross Gale
7a04ec01af 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
ce1e6fe7d2 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
51a47c56c4 Documentation updates following review 2017-12-06 09:50:50 +00:00
Tom Page
eb935954e9 Revert "Update Alfresco dependency to 5.0.4." 
This reverts commit 7164253241.
 2017-12-06 09:33:02 +00:00
Ross Gale
c8932192f9 RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Tom Page
ca4cf0070f Revert "Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'"" 
This reverts commit 2437ff415c.
 2017-12-05 14:37:07 +00:00
Tom Page
2437ff415c Revert "Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6'" 
This reverts commit 83f81da0bd, reversing
changes made to 915e99394c.
 2017-12-05 14:36:38 +00:00
Tom Page
4d6aaff70e Merge release/V2.6 into master. 2017-12-05 10:20:50 +00:00
Tom Page
83f81da0bd Merge branch 'merge-2.6/RM-5132_AutomationChanges' into 'release/V2.6' 
Merge 2.6/rm 5132 automation changes

See merge request !710
 2017-12-05 10:00:57 +00:00