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,286 Commits 324 Branches 2,170 Tags
a626e7d0ba1b6ff7b4ec1c9d85429f0a6093fe9d
Commit Graph

724 Commits

Author SHA1 Message Date
Rodica Sutu
a626e7d0ba Merge branch 'feature/RM-6835_FixJavaDocRMCommunity' into 'master' 
Fix java docs for rm community repo:

Closes RM-6835

See merge request records-management/records-management!1163
 2019-05-07 06:51:48 +01:00
Rodica Sutu
b5edd5c5d0 review comments: add the missing @param values, @return type 2019-05-06 21:47:26 +03:00
Ross Gale
e5ba3f5574 RM-6834 adding fix for system edited records not being returned from search 2019-04-25 14:10:12 +01:00
Rodica Sutu
fc839d3307 Fix java docs for rm community repo: 
update/remove/add  method parameters as @param in doc comments
substitute element < with &lt;
substitute element > with &gt;
substitute element & with  &amp;
 2019-04-25 09:32:00 +03:00
Rodica Sutu
4934fa5634 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
0c2833a5a2 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
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
6cf5344989 Merge branch 'feature-3.0.1/RM-6788_ArchiveClassifyDeclareFix' into 'release/V3.0' 
RM-6788 adding change to 3.0.1 branch

See merge request records-management/records-management!1133
 2019-03-18 13:07:58 +00:00
cagache
73c8c23766 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
rlucanu
86ae0f726a RM-6786 another fix 2019-03-14 16:24:50 +02:00
rlucanu
2f15cc786e RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
Ross Gale
8d97d12f88 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
Rodica Sutu
eafe3ebf30 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
475164672e 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
dfb473eef6 added unit tests 2019-02-18 15:16:48 +02:00
cagache
6a5c267170 addressed code review comments 2019-02-18 10:57:16 +02:00
cagache
b09d7bf8ea added javadoc and removed unused imports 2019-02-15 17:11:04 +02:00
cagache
6ba8c36281 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
1cae71c02a added behaviour to duplicate the bin before declaring a version record 2019-02-14 12:55:10 +02:00
cagache
d94b0fb7fd added IT for delete classified content with copies 2019-02-13 16:00:05 +02:00
cagache
87b56030bd 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
Rodica Sutu
78b7f39695 Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2019-01-16 11:44:49 +02:00
Ross Gale
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
cagache
af42247487 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/Merge_MNT-19967_From2.6 2018-10-03 10:10:12 +03:00
cagache
3dedf274f2 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
 2018-10-02 14:51:13 +03:00
cagache
7419a076c7 MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
Rodica Sutu
a9b292c9fa Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2018-09-10 12:50:01 +03:00
cagache
2b43e58852 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
Rodica Sutu
2b8ebc8bb7 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
b12e058cc7 use fileFolderService instead of contentService 2018-08-24 17:26:25 +03:00
cagache
270e9835de MNT-18806 create a new content URL for the copy only if it has content 2018-08-24 16:25:20 +03:00
cagache
3d0194e9d4 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
49aae5d00e MNT-18806 create a new content bin for the copy on copy complete behavior 2018-08-24 13:25:45 +03:00
Rodica Sutu
086faa7a19 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +03:00
Claudia Agache
88a17d7007 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
ea6ad35b65 update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
d04ea4b657 remove custom record search converter 2018-08-16 19:11:57 +03:00
Sara Aspery
56c1038774 RM-6355 Fix null pointer 
(cherry picked from commit d22fc1f6ad7d0761e47931056328570e17a46f54)
 2018-07-27 17:13:45 +03:00
Rodica Sutu
0bbdb08ccd compare the new version of module currently being installed with the one installed 
(cherry picked from commit 4211d4bd8a)
 2018-07-26 13:00:10 +03:00
Rodica Sutu
4211d4bd8a compare the new version of module currently being installed with the one installed 2018-07-26 11:13:26 +03:00
Tom Page
43ffc8aaee Merge master into RM-5859_AnyMarksStaging. 2018-06-29 11:30:14 +01:00
Rodica Sutu
8061d5a354 fix the date-time string not changed to a simple date 2018-06-20 17:52:28 +03:00
Rodica Sutu
95f6f7174e revert the change for truncating the date with time 2018-06-19 08:44:10 +03:00
Rodica Sutu
c87aff832a review changes and fix for converting string with time to date using a LocalDateDeserializer 2018-06-18 10:58:48 +03:00
Rodica Sutu
365badd32e java docs updates and fix the deserialisation for the LocalDate from topics 2018-06-15 14:30:33 +03:00
Rodica Sutu
6320a0fe8c -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
cagache
b9e816c9ee Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-18558_PermissionIssue 2018-06-12 16:03:42 +03:00
cagache
6717a32b9c 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