Commit Graph

457 Commits

Author SHA1 Message Date
Rodica Sutu
2d06a30243 Merge remote-tracking branch 'origin/release/V3.0' into merge/RM-6787_VersionWhenClassifyFileWithCopies 2019-04-10 09:04:01 +03:00
Rodica Sutu
bb93c0ad4e Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
2019-04-09 10:51:44 +03:00
Ross Gale
9baac01d03 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Ross Gale
ed8f24865c RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Rodica Sutu
c6a45874fb Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 23:31:20 +02:00
Rodica Sutu
c96f9ae280 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
cc3f72cfaf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02:00
cagache
ab762cf8f5 addressed code review comments 2019-02-18 10:57:16 +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
Ross Gale
c68c814513 RM-6702 updating headers to 2019 2019-01-04 15:25:11 +00:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
a0575dbc8a RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
cabc902203 RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
cagache
873470ec26 Merge changes from 2.6.1 release to master 2018-09-03 09:54:56 +03:00
cagache
72918feef6 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
Rodica Sutu
df19e3749e Merge origin/release/V2.6' into merge-2-7/MNT-19080_RM-6504_MergeFrom2.6
* remotes/origin/release/V2.6:
  fixed tests because exception changed
  use fileFolderService instead of contentService
  MNT-18806 create a new content URL for the copy only if it has content
  MNT-18806 create a new content bin for the copy on copy complete behavior
  MNT-18806 Add REST test for deleting copy of record.
  MNT-18806 Remove some raw Exceptions from REST test framework.
2018-08-27 20:01:26 +03:00
cagache
ea40d03c80 use fileFolderService instead of contentService 2018-08-24 17:26:25 +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
Rodica Sutu
caa79346e6 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +03:00
Rodica Sutu
2a330bdf68 rename the extended bean simpleMappingExceptionResolverParent (core change)
(cherry picked from commit 1dd650d5eb)
2018-08-17 10:42:54 +03:00
David Webster
e117e16b4e Merge remote-tracking branch 'origin/master' into feature/RM-6269_Rebranding_artifactIds 2018-07-26 16:59:22 +01:00
cagache
5b40cb4bdc code review changes 2018-07-26 09:26:57 +03:00
cagache
becac80369 RM-4287 Updated modules name and description 2018-07-25 16:50:46 +03:00
cagache
d27fee791a RM-4287 Updated modules name and description 2018-07-25 11:27:08 +03:00
Rashmi Itagi
f8a1697e34 RM-6269 alfresco-ags to alfresco-governance-services and alfresco.rm.artifactId to ags.artifactId 2018-07-24 17:03:45 +01:00
Rodica Sutu
9b16443987 java docs updates and fix the deserialisation for the LocalDate from topics 2018-06-15 14:30:33 +03:00
Rodica Sutu
d2f303fab8 additional changes for RM-6354 2018-06-15 13:11:19 +03:00
Rodica Sutu
5266d1f7ce -fix de/serialization of joda type by:
using of jackson joda date type to deserialize local date
using a custom serializer for joda date types
2018-06-15 13:09:53 +03:00
Rodica Sutu
f7906a7b5e Merge branch 'feature/RM-6385_MappingCoreAPIResponses' into 'master'
RM-6385 Fix for mapping Core API Responses

See merge request records-management/records-management!1045
2018-06-14 13:06:54 +01:00
Rodica Sutu
1dd650d5eb rename the extended bean simpleMappingExceptionResolverParent (core change) 2018-06-14 08:27:55 +03:00
Sara Aspery
0da38c1bb7 RM-6354 Module repo version error 2018-06-13 10:28:36 +01:00
Rodica Sutu
9500e00f09 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00
Rodica Sutu
1bf5d1d77c fix integration tests 2018-05-23 12:36:24 +03:00
Sara Aspery
d4721683f6 Merge branch 'feature/RM-6318_SearchUpdatesForCert' into 'release/V2.7.0.x'
RM-6318 SearchDerivedByJavaAPI

See merge request records-management/records-management!996
2018-05-22 13:26:30 +01:00
Roxana Lucanu-Ghetu
8251588fd1 RM-6320 Code review changes. 2018-05-16 15:35:43 +03:00
Roxana Lucanu-Ghetu
5dd2640674 RM-6320 Added Declassification Review properties in records search 2018-05-16 11:03:32 +03:00
Rodica Sutu
1d4c86dd38 Spring upgrade remove dependency-check attribute 2018-05-15 12:59:20 +03:00
Rodica Sutu
04b696c2c3 RM-6313 update of jobs and triggers according to Spring 5 and Quartz library 2.3.0 upgrade 2018-05-14 09:39:48 +03:00
Rodica Sutu
e6d88ab7de Spring update - update of xsd declaration for the context files 2018-05-14 09:35:42 +03:00
Ross Gale
888157199d search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
504d85e8d3 Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00
Rodica Sutu
ed5fc95bf3 Merge remote-tracking branch 'remotes/origin/feature/RM-6302_EditDispositionSchedule' 2018-05-04 14:57:14 +03:00
Ross Gale
308e86a4e5 RM-6302 adding the java work to edit disposition schedule 2018-05-02 21:52:08 +01:00
Ross Gale
b8af7ba22a JITC prevent accession disposition action being offered if there is an incomplete event 2018-05-01 17:51:13 +01:00
gbroadbent
9f38cddb3a SIMPLIFIED CHINESE: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:12:29 +01:00
gbroadbent
dc10fcb806 BRAZILIAN Portuguese: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:11:49 +01:00
gbroadbent
d25e253a27 RUSSIAN: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:11:13 +01:00
gbroadbent
063792cf58 DUTCH: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:10:36 +01:00