Commit Graph

5083 Commits

Author SHA1 Message Date
Claudia Agache
4c4b41bfb8 fix the parameter 2020-04-03 16:26:03 +03:00
Claudia Agache
d222954e15 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
8ec75aa6a1 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
59feba75e4 code review comments 2020-04-03 14:51:02 +03:00
Claudia Agache
3b51ce4966 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
019a9a0375 move the cmis query tests
add some additional usecase

(cherry picked from commit d3284b1400)
2020-04-03 09:30:52 +03:00
Claudia Agache
bc7aa82479 Revert "Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'"
This reverts commit 594931a1
2020-04-02 16:30:29 +03:00
Claudia Agache
3a0bfff79a 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
e51fb20ccb 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
594931a1f2 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
Tom Page
f25e12939e RM-7145 Wire in RM AuthenticationUtil. 2020-04-01 15:34:25 +01:00
Tom Page
2f476bdb0d RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Roxana Lucanu
c4525dec49 RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Claudia Agache
6f2d4f4b8f RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 16:18:35 +02:00
Claudia Agache
e3dad2b924 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
6305967df6 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
50cced2cb6 RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 12:34:57 +02:00
Tom Page
ad4fce6bc3 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
0e7ac0f0c5 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
db852d52e5 RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Roxana Lucanu
658bd53535 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
5a645d39ed RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
8bd1e384b2 Merge branch 'release/v2.6' into merge-2.7/RM-7065_RetentionScheduleInheritance 2020-01-27 10:46:44 +02:00
Roxana Lucanu
d5cc12faaa Merge branch 'revert-93f966a3' 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
aaf18955be 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
9f8dcc0c0b Merge branch 'revert-ffc768cb' 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
e0835f9e82 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
93f966a345 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
7b6db44df4 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
83e342ec06 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
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
7384b3f160 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
490051aa21 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
286d18e24c 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
ffc768cbd5 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
e0fc20b01d 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
897a450001 Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
Roxana Lucanu
48bb960725 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Roxana Lucanu
3794ddbca3 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
dbde8cefbb RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
a81409f821 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
1e38a577a0 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
Roxana Lucanu
f06f2df8b1 RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
862c19df35 RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
f30cca289d RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
75bc33640e MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Roxana Lucanu
313a0fe5bf 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
2dd9015ad8 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
99185e264f 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
Ross Gale
57e464b47f Updating headers 2020-01-06 11:54:31 +00:00