inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,990 Commits 330 Branches 2,178 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Page
7164253241 Update Alfresco dependency to 5.0.4. 2017-12-04 14:15:40 +00:00
Ross Gale
3ce7ed8eb9 Merge branch 'feature-2.3/RM-5878_SavedSearchMNT' into 'release/V2.3' 
Feature 2.3/rm 5878 saved search mnt

See merge request !705
 2017-12-04 12:11:41 +00:00
Tom Page
4f490b4699 RM-5132 Add RecordsAPI.getRecordNodeRef method. 2017-11-30 11:27:17 +00:00
Ross Gale
7eaf1ad76e Merge branch 'feature-2.3/RM-5878_SavedSearchMNT' of git.alfresco.com:records-management/records-management into feature-2.3/RM-5878_SavedSearchMNT 2017-11-30 09:52:51 +00:00
Ross Gale
0ae59951ef RM-5878 removing test scope from testng 2017-11-30 09:52:35 +00:00
Ross Gale
0f5b72599f Update RMv23SavedSearchesPatch.java 2017-11-30 09:28:53 +00:00
Ross Gale
ffe5429927 RM-5878 code review changes 2017-11-29 14:05:39 +00:00
Ross Gale
097f2d848a RM-5878 adding config so patch will run on start up, fixing issue caused by missing maven dependancy for jcommander 1.66 2017-11-28 10:05:36 +00:00
Claudia Agache
9c9f1d6098 Merge branch 'feature/RestApiRefactoring' into 'master' 
deleted duplicates and moved some methods from RmEnterpriseTestUtils to specific…

See merge request !697
 2017-11-28 07:56:29 +00:00
Ana Bozianu
a36e1773af Merge remote-tracking branch 'origin/merge-2.6/MNT-18793' into merge/MNT-18793 2017-11-27 15:17:16 +02:00
Ana Bozianu
915e99394c Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793 2017-11-27 15:15:03 +02:00
Ana Bozianu
4fcfdb164e Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
Tom Page
c73f5b9863 Use apache commons Pair, rather than javafx. 
This makes automated import ordering simpler if nothing else.
 2017-11-27 11:22:43 +00:00
alfresco-build
d9b6c0d6f5 [maven-release-plugin] prepare for next development iteration 2017-11-27 10:37:48 +00:00