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
Ross Gale
89d0de6b50
MNT-20822 adding comment to overwritten method
2020-01-09 13:36:35 +00:00
Ross Gale
8228fe5939
MNT-20822 adding fix for has more
2020-01-06 16:15:04 +00:00
Ross Gale
b1f3d11cf5
MNT-20822 adding fix for has more
2020-01-06 13:58:03 +00:00
Ross Gale
155952d28f
Updating headers
2020-01-06 11:54:31 +00:00
Sara Aspery
943dc45a10
Update license headers
2020-01-02 13:57:59 +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
a7f2dec355
RM-7060 Reapply search aspect when filing/moving
2019-11-26 21:57:35 +02:00
Ross Gale
ffaf55c7d3
Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
...
Resolve RM-7051 "Hotfix 2.5/ disposition"
See merge request records-management/records-management!1303
Adds web script to ensure all records have correct disposition instructions
2019-11-22 18:15:24 +00:00
Ross Gale
df6d92d031
Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
...
Resolve RM-7051 "Hotfix 2.5/ disposition"
See merge request records-management/records-management!1303
Adds web script to ensure all records have correct disposition instructions
2019-11-22 14:25:27 +00:00
Tom Page
5f87a5cd92
Update license headers.
2019-10-02 14:58:48 +01:00
cagache
82046a2f0f
Back-port fix from MNT-19967
...
(cherry picked from commit 4de260d588
2019-07-10 07:52:28 +03:00
rlucanu
8438e17a8d
Reset code back to b03837b751.
2019-07-10 07:49:40 +03:00
rlucanu
a606a343b3
Revert "Record only merge of version change."
...
This reverts commit 6e197f2a2d211244279a
2019-07-09 12:12:28 +03:00
cagache
a5629acc2a
added unit tests
2019-02-18 15:16:48 +02:00
cagache
ab762cf8f5
addressed code review comments
2019-02-18 10:57:16 +02:00
cagache
b6d6094ebe
added javadoc and removed unused imports
2019-02-15 17:11:04 +02:00
cagache
54010f6ab9
MNT-20145 Duplicate the content url when declaring node as record, version as record, classifying or securing if the node has copies or it is a copy
2019-02-15 16:41:18 +02:00
cagache
3c47771450
added behaviour to duplicate the bin before declaring a version record
2019-02-14 12:55:10 +02:00
cagache
5b477a7b64
added IT for delete classified content with copies
2019-02-13 16:00:05 +02:00
cagache
a5dc916a7e
MNT-20145 Don't delete the content url if the file has copies or it is a copy
2019-02-07 17:54:46 +02:00
Ross Gale
cabc902203
RM-6702 updating headers to 2019
2019-01-03 14:30:44 +00:00
Ross Gale
bc6b9741ad
RM-6702 Updating licence headers
2019-01-03 09:23:49 +00:00
cagache
47d3f91abc
MNT-19967 Get record disposition schedule from first parent category which has one
2018-09-27 12:40:04 +03:00
cagache
ea40d03c80
use fileFolderService instead of contentService
2018-08-24 17:26:25 +03:00
cagache
d764fef7a5
MNT-18806 create a new content URL for the copy only if it has content
2018-08-24 16:25:20 +03:00
cagache
6691a4966c
Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp
2018-08-24 13:33:59 +03:00
cagache
770ee1047b
MNT-18806 create a new content bin for the copy on copy complete behavior
2018-08-24 13:25:45 +03:00
Claudia Agache
3eb7f62f27
Merge branch 'feature-2.6/RM-6504_ChangeACSVersion' into 'release/V2.6'
...
RM-6504 Changed ACS version
See merge request records-management/records-management!1098
2018-08-21 14:17:20 +01:00
Rodica Sutu
df280e176d
update the ElementInfo() according to REPO-2983
2018-08-20 12:21:44 +03:00
Rodica Sutu
b7f2afb0de
remove custom record search converter
2018-08-16 19:11:57 +03:00
cagache
155d118672
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
2018-06-11 14:49:24 +03:00
Ross Gale
993b4f5846
MNT-19442 merging up fix for 2.5.4
2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
ef1f8311be
MNT-18558 Fix permission issue
2018-06-05 17:22:47 +03:00
Ross Gale
783bccb925
MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider
2018-06-04 14:48:39 +01:00
Rodica Sutu
d11efb8c77
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5
...
# Conflicts:
# rm-automation/pom.xml
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
# rm-enterprise/pom.xml
2018-02-24 21:48:16 +02:00
Elena Hardon
f1e3c0b853
MNT-19114 - Made review changes
2018-02-19 13:40:52 +02:00
Elena Hardon
e1b24791be
RM-19114: Removed the condition on creating only 2 folder-types from root and modified the unit test that was checking this
...
(cherry picked from commit af108af09125ed3da3e6ff6673434c3b045469a2)
# Conflicts:
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java
2018-02-15 20:47:38 +02:00
Tom Page
0268299006
Updating license header to 2018
2018-01-16 12:31:06 +00:00
Tom Page
4987e1ca40
Updating license header to 2018
2018-01-16 12:26:10 +00:00
Tom Page
350a198837
Updating license header to 2018
2018-01-16 12:21:10 +00:00
Tom Page
01961c2382
Merge release/V2.5 into release/V2.6.
2017-12-19 10:26:22 +00:00
Tom Page
ebfee294df
Merge release/V2.5.2.x into release/V2.5.
2017-12-19 10:20:48 +00:00
Ross Gale
b0cc81fc2c
Merge branch 'release/V2.5' into merge-2.6
2017-12-11 10:49:30 +00:00
Sara Aspery
defcb53c70
MNT-18771 Publish Job Upgrade Error
2017-12-08 22:10:16 +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
Ross Gale
ea4b979a5f
Merge branch 'release/V2.4' into merge2.5
2017-12-06 11:29:10 +00:00
Ross Gale
c8932192f9
RM-5878 mnt changes added to a 2.4 branch
2017-12-05 16:21:07 +00: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
