Commit Graph

5172 Commits

Author SHA1 Message Date
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
Ross Gale
155952d28f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
1065c1c064 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 Merge branch 'release/V2.6' into release/V2.7
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
8f9faf6b0e Merge branch 'merge-2.7/RM-7060_FixSearchAspect' into 'release/V2.7'
Resolve RM-7060 "Merge 2.7/ fixsearchaspect"

See merge request records-management/records-management!1329
2019-12-09 08:24:51 +00:00
Roxana Lucanu
6035370684 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
ac12711512 Merge branch 'merge-2.6/RM-7060_FixSearchAspect' into 'release/V2.6'
Resolve RM-7060 "Merge 2.6/ fixsearchaspect"

See merge request records-management/records-management!1321
2019-12-04 13:40:22 +00:00
Roxana Lucanu
8d5ff56f8f Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Roxana Lucanu
89cc90cef7 Merge branch 'feature-2.5/RM-7060_FixSearchAspect' into 'release/V2.5'
RM-7060 Reapply search aspect when filing/moving

See merge request records-management/records-management!1315
2019-11-28 13:22:55 +00:00
Roxana Lucanu
f138d31436 RM-7060 Fix integration tests 2019-11-27 11:28:32 +02:00
Roxana Lucanu
a7f2dec355 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00