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
5,184 Commits 324 Branches 2,170 Tags
dd7bd971011e67f6983eef0aa0fc433baf5cc35c
Commit Graph

5184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claudia Agache
353ff7b8ee Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion 
# Conflicts:
#	rm-enterprise/pom.xml
 2020-04-03 16:21:40 +03:00
Claudia Agache
8d1012b6d2 Merge pull request #1115 from Alfresco/feature-2.6/RM-7148_UpdateACSVersion 
Feature 2.6/rm 7148 update acs version
 2020-04-03 15:22:27 +03:00
Claudia Agache
604fc7785e code review comments 2020-04-03 14:51:02 +03:00
Claudia Agache
278699f183 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
a18c22155f move the cmis query tests 
add some additional usecase

(cherry picked from commit c20cfb3c6f)
 2020-04-03 09:30:52 +03:00
Claudia Agache
7e59b6aee0 Revert "Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'" 
This reverts commit efb33e67
 2020-04-02 16:30:29 +03:00
Claudia Agache
907da24b2f Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/RM-7148_UpdateACSVersion 2020-04-02 14:34:02 +03:00
rlucanu
a3f4159812 Merge pull request #1112 from Alfresco/feature-2.6/RM-7145_SearchQueryHasMoreItems 
RM-7145 Fix for hasMoreItems
 2020-04-02 13:23:18 +03:00
Tom Page
efb33e6723 Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7' 
RM-7119 Fix startup with ACS 5.2.7.

See merge request records-management/records-management!1393
 2020-04-02 10:53:45 +03:00
rodicasutu
8f5c44d4a6 add the missing class 2020-04-02 08:34:34 +03:00
Tom Page
98a1485baa RM-7145 Wire in RM AuthenticationUtil. 2020-04-01 15:34:25 +01:00
Tom Page
94b209e0ea RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
rodicasutu
b687127d57 wip CMIS tests for MNT-20822 2020-04-01 08:59:06 +03:00
Roxana Lucanu
7def9837ad RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Claudia Agache
c73d0a908e RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 16:18:35 +02:00
Claudia Agache
f33b30b64a Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.7/RM-7131_UpdateOldGitlabRefs_no 
# Conflicts:
#	README.txt
#	pom.xml
 2020-03-24 15:40:05 +02:00
Claudia Agache
1c459fc16b Merge pull request #1110 from Alfresco/feature-2.6/RM-7131_UpdateOldGitlabRefs_no 
RM-7131 Update old gitlab repo links with the new one from github
 2020-03-24 15:33:13 +02:00
Claudia Agache
c3cdd88873 RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 12:34:57 +02:00
Tom Page
a03c61b241 Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7' 
RM-7119 Fix startup with ACS 5.2.7.

See merge request records-management/records-management!1393
 2020-02-28 08:06:16 +00:00
Tom Page
ddae9fbd64 RM-7119 Throw explicit exception rather than logging message. 
Also address other code review comments.
 2020-02-27 07:55:40 +00:00
Tom Page
ff9be3024b RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Roxana Lucanu
1e33006413 Merge branch 'merge-2.7/RM-7065_RetentionScheduleInheritance' into 'release/V2.7' 
Resolve RM-7065 "Merge 2.7/ retentionscheduleinheritance"

See merge request records-management/records-management!1358
 2020-01-27 15:04:41 +00:00
Roxana Lucanu
59e0979070 RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
1f09c8454e Merge branch 'release/v2.6' into merge-2.7/RM-7065_RetentionScheduleInheritance 2020-01-27 10:46:44 +02:00
Roxana Lucanu
26b2d55140 Merge branch 'revert-b562d979' into 'release/V2.7' 
Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"

See merge request records-management/records-management!1357
 2020-01-27 08:43:59 +00:00
Roxana Lucanu
b2011a8a52 Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'" 
This reverts merge request !1353
 2020-01-27 08:43:09 +00:00
Roxana Lucanu
ced4d68a02 Merge branch 'revert-80b8dd2b' into 'release/V2.6' 
Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'"

See merge request records-management/records-management!1356
 2020-01-27 08:16:04 +00:00
Roxana Lucanu
de34a72e33 Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'" 
This reverts merge request !1350
 2020-01-27 08:14:33 +00:00
Roxana Lucanu
b562d97966 Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7' 
Resolve RM-7065 "Merge 2.7/ mnt 20822"

See merge request records-management/records-management!1353
 2020-01-20 18:16:54 +00:00
Roxana Lucanu
db4dc1f016 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
4a41a8cdf5 Merge branch 'merge-2.6/RM-5733_portingFix' into 'release/V2.6' 
RM-5733 porting fix - cherry picked commit a2f515a6

See merge request records-management/records-management!1352
 2020-01-20 09:23:47 +00:00
Tom Page
4b01395ae6 RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
c108b46715 Merge branch 'merge-2.6/RM-7065' into 'release/V2.6' 
Merge branch 'merge-2.6/RM-7065' into 'release/V2.6'

See merge request records-management/records-management!1351
 2020-01-16 09:10:43 +00:00
Roxana Lucanu
25d400d3b5 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5' 
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
 2020-01-14 19:02:48 +02:00
Roxana Lucanu
53c2fa77a7 Revert "Merge branch 'merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.6'" 
This reverts merge request !1349
 2020-01-14 16:40:18 +00:00
Roxana Lucanu
80b8dd2bff Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6' 
Resolve MNT-20822 "Merge 2.6/ hasmore"

See merge request records-management/records-management!1350
 2020-01-14 14:13:33 +00:00
Roxana Lucanu
6fc983a88e Merge branch 'merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.6' 
Resolve RM-7065 "Merge 2.6/ retentionscheduleinheritancerecordlevel"

See merge request records-management/records-management!1349
 2020-01-14 14:10:36 +00:00
Roxana Lucanu
1954b9bece Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
Roxana Lucanu
f85f9f3a05 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Roxana Lucanu
22e7893940 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5' 
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
 2020-01-10 09:26:14 +00:00
Roxana Lucanu
ef6bac0b56 RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
4f74691a9a Merge branch 'feature-2.6/MNT-20822-hasMore' into 'release/V2.6.0.x' 
MNT-20822 adding fix for has more

See merge request records-management/records-management!1343
 2020-01-09 15:27:32 +00:00
Ross Gale
89d0de6b50 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
Roxana Lucanu
c40b4217cf RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
b9fc4e101f RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
b6b50306b3 RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
8228fe5939 MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Roxana Lucanu
ee306dd59c Merge branch 'feature-2.5/UpdateLicenseHeader' into 'release/V2.5' 
update license header

See merge request records-management/records-management!1341
 2020-01-06 16:12:25 +00:00
Ross Gale
b1f3d11cf5 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
ecca6fef85 Merge branch 'feature-2.6/MNT-20822_UpdatingHeaders' into 'release/V2.6.0.x' 
Updating headers

See merge request records-management/records-management!1342
 2020-01-06 11:56:11 +00:00