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

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
75a8094b67 Update the actions type from RuleDefinition class in order to be able to use it with other non-rm actions 2018-10-25 11:25:19 +03:00
cagache
bfd0e588eb Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Merge_MNT-19967_From2.6 2018-10-04 08:39:56 +03: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
Claudia Agache
7df8e4084c Merge branch 'feature-2.6/MNT-19967_RetentionScheduleInheritance' into 'release/V2.6' 
MNT-19967 Fix retention schedule inheritance on record level

See merge request records-management/records-management!1102
 2018-10-02 06:36:55 +01:00
cagache
690d55cf44 code review changes 2018-10-01 18:34:14 +03:00
cagache
972c44bd74 Merge remote-tracking branch 'remotes/origin/release/V3.0' 2018-10-01 18:03:18 +03:00
cagache
d026355bb4 Merge remote-tracking branch 'remotes/origin/release/V3.0.0.x' into merge-3.0/Merge3.0.0.xTo3.0_no 2018-10-01 16:42:26 +03:00
cagache
810879d51c code review changes 2018-10-01 16:38:19 +03:00
Claudia Agache
14efe12be3 Merge branch 'hotfix-3.0/RM-6575_PushCommunityImageWithSpecificTag_no' into 'release/V3.0.0.x' 
RM-6575 Push community images with specific tags instead of latest on quay and docker hub

See merge request records-management/records-management!1103
 2018-10-01 12:03:01 +01:00
cagache
b078149258 cherry pick changes from V2.7 branch 2018-10-01 12:22:58 +03:00
cagache
dcc8d9a651 reverted changes because they are already on the V2.7 branch and can be picked from there 2018-10-01 11:57:11 +03:00
cagache
2788adb926 applied code review changes 2018-10-01 11:41:40 +03:00
cagache
e0616074d2 RM-6575 Push community images with specific tags instead of latest on quay and docker hub 2018-10-01 10:39:42 +03:00
cagache
26a966743e Added 3 more tests to check Retention schedule inheritance for records and record folders 2018-09-28 11:40:32 +03:00
cagache
f1ee0585b7 Corrected variable name 2018-09-28 09:29:07 +03:00
cagache
63e56b9003 Automated test for disposition schedule inheritance 2018-09-28 08:23:11 +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
6b1eb5c71f Record only merge of release/V3.0 into master 2018-09-06 10:03:08 +03:00
cagache
ac606c0b56 Record only merge of release/V2.7 into release/V3.0 2018-09-06 10:01:38 +03:00
cagache
6bfe80c449 Record only merge of release/V2.7.1.x into release/V2.7 2018-09-06 09:59:47 +03:00
cagache
923bd19b78 Update version to 2.7.1.1-SNAPSHOT 2018-09-06 09:53:23 +03:00
alfresco-build
300d46780d [maven-release-plugin] prepare for next development iteration 2018-09-06 07:19:43 +01:00
alfresco-build
7c50bb6b0d [maven-release-plugin] prepare release V2.7.1 2018-09-06 07:19:39 +01:00
cagache
3f76fa32cf Merge changes from 2.6.1 release to master 2018-09-03 09:54:56 +03:00
cagache
78934f13b4 tag should be HEAD until next release 2018-08-31 17:28:57 +03:00
cagache
2b43e58852 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
cagache
048924c3e0 Record only merge of version change. 2018-08-31 09:44:24 +03:00
cagache
4ea4973b1d Record only merge of version change. 2018-08-31 09:34:01 +03:00
cagache
3b1feb52ff Update version to 2.6.1.1-SNAPSHOT 2018-08-31 08:58:41 +03:00
Rodica Sutu
3b21e7e125 Merge branch 'release/V2.6' into merge-2-7/MNT-19080 2018-08-30 17:38:19 +03:00
alfresco-build
545208af53 [maven-release-plugin] prepare for next development iteration 2018-08-30 09:59:18 +01:00
alfresco-build
abb0398e5a [maven-release-plugin] prepare release V2.6.1 2018-08-30 09:59:13 +01:00
Rodica Sutu
e110580b50 Merge branch 'feature-2.6/RM_6519_UpdateModuleREPOMinVersion' into 'release/V2.6' 
RM-6519 Update Module REPO Min Version

See merge request records-management/records-management!1100
 2018-08-29 21:13:04 +01:00
Rodica Sutu
c15789c628 update the repo min version to 5.2.4 as none of the ACS values below this should be supported with RM 2.6.1 2018-08-29 17:54:06 +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
Claudia Agache
2ee5fa54e4 Merge branch 'feature-2.6/MNT-18806_DeleteCopy_fp' into 'release/V2.6' 
MNT-18806 Create a new content URL for the copy

See merge request records-management/records-management!1099
 2018-08-24 19:54:37 +01: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
Rashmi Itagi
1e12b4aacf Merge branch 'feature/RM-6269_Rebranding_artifactIds' into 'master' 
RM-6269 Rebranding

See merge request records-management/records-management!1094
 2018-08-23 10:26:26 +01: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
2802445e42 Merge branch 'feature-2.6/MNT-19080_RMSearchParameters_remove_converter' into 'release/V2.6' 
MNT-19080_RMSearchParameters deactivates audit of searches

See merge request records-management/records-management!1097
 2018-08-21 12:54:57 +01:00
cagache
6df47241e4 added aspectNames and nodeType properties 2018-08-21 14:23:38 +03:00
cagache
5c9ee09309 changed profile ids 2018-08-21 10:59:23 +03:00
cagache
75f4241165 Merged with master 2018-08-21 10:30:50 +03:00
Rodica Sutu
f67aa29145 change the amps name installed for the apply-rm-community profile as there is no compatible version of ACS 5.2.N community with RM 2.6.1 community 2018-08-21 10:23:12 +03:00