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

5109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Gale
d1630f6337 Merge branch 'merge-3.0/RM-6702_LicenceUpdate' into 'release/V3.0' 
Resolve RM-6702 "Merge 3.0/ licenceupdate"

See merge request records-management/records-management!1109
 2019-01-04 13:21:19 +00:00
Ross Gale
44cbc77aee RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
29b4cb86bb Record only merge of header update 2019-01-04 12:21:27 +00:00
Ross Gale
fbe7f6aa4c Merge branch 'merge-2.7/RM-6702_LicenceUpdate' into 'release/V2.7' 
Resolve RM-6702 "Merge 2.7/ licenceupdate"

See merge request records-management/records-management!1108
 2019-01-04 12:03:49 +00:00
Ross Gale
a0575dbc8a RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
7fb171c772 Record only merge of header update 2019-01-04 09:39:14 +00:00
Ross Gale
c121c73540 Merge branch 'merge-2.6/RM-6702_LicenceUpdate' into 'release/V2.6' 
Resolve RM-6702 "Merge 2.6/ licenceupdate"

See merge request records-management/records-management!1107
 2019-01-04 08:42:47 +00:00
Ross Gale
cabc902203 RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Ross Gale
761df5cd5e Record only merge of header update 2019-01-03 14:20:58 +00:00
Ross Gale
68caa1cff3 Merge branch 'merge-2.5/RM-6702_HeaderUpdate' into 'release/V2.5' 
RM-6702 Updating licence headers

See merge request records-management/records-management!1106
 2019-01-03 11:13:21 +00:00
Ross Gale
bc6b9741ad RM-6702 Updating licence headers 2019-01-03 09:23:49 +00:00
cagache
047bec40ad 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
6e54380abf 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
f5f713f62b 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
b35d5e363a code review changes 2018-10-01 18:34:14 +03:00
cagache
00cbfd1689 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
06f46af489 code review changes 2018-10-01 16:38:19 +03:00
Claudia Agache
f1f4b2d6ad 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
d5958eaf7b cherry pick changes from V2.7 branch 2018-10-01 12:22:58 +03:00
cagache
a69d1ddaa3 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
3b5cd3f9ba applied code review changes 2018-10-01 11:41:40 +03:00
cagache
6d2e522cf7 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
b9e6b79dd2 Added 3 more tests to check Retention schedule inheritance for records and record folders 2018-09-28 11:40:32 +03:00
cagache
31a69c2085 Corrected variable name 2018-09-28 09:29:07 +03:00
cagache
c5cffb8cda Automated test for disposition schedule inheritance 2018-09-28 08:23:11 +03: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
4f3a616c69 Record only merge of release/V2.7 into release/V3.0 2018-09-06 10:01:38 +03:00
cagache
425ed3bd6a Record only merge of release/V2.7.1.x into release/V2.7 2018-09-06 09:59:47 +03:00
cagache
c46fe145a1 Update version to 2.7.1.1-SNAPSHOT 2018-09-06 09:53:23 +03:00
alfresco-build
d78bf82b32 [maven-release-plugin] prepare for next development iteration 2018-09-06 07:19:43 +01:00
alfresco-build
4ae51587f2 [maven-release-plugin] prepare release V2.7.1 ags-2.7.1 2018-09-06 07:19:39 +01:00
cagache
a2a88cbede tag should be HEAD until next release 2018-08-31 17:28:57 +03:00
cagache
72918feef6 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
cagache
52865e959f Record only merge of version change. 2018-08-31 09:44:24 +03:00
cagache
3725b5a03f Record only merge of version change. 2018-08-31 09:34:01 +03:00
cagache
fad31498c6 Update version to 2.6.1.1-SNAPSHOT 2018-08-31 08:58:41 +03:00
Rodica Sutu
495968c49a Merge branch 'release/V2.6' into merge-2-7/MNT-19080 2018-08-30 17:38:19 +03:00
alfresco-build
4798cf7ecf [maven-release-plugin] prepare for next development iteration 2018-08-30 09:59:18 +01:00
alfresco-build
3eed3fb63e [maven-release-plugin] prepare release V2.6.1 ags-2.6.1 2018-08-30 09:59:13 +01:00
Rodica Sutu
d309b381e0 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
61d151b26b 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
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
Claudia Agache
2aa1723b18 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
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
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
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
2bc487a437 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