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

5339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
caa35587e0 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
Rodica Sutu
6ea2103c72 Merge remote-tracking branch 'remotes/origin/release/V2.5.3.x' into merge-2.5/MNT_20191_RM_export_tool 2019-01-16 11:41:47 +02:00
alfresco-build
f630a56e00 [maven-release-plugin] prepare for next development iteration 2019-01-16 08:24:53 +00:00
alfresco-build
0df6569681 [maven-release-plugin] prepare release V2.5.3.1 ags-2.5.3.1 2019-01-16 08:24:49 +00:00
Sara Aspery
c9d5d2bf93 Merge branch 'hotfix-2.5/MNT-20191_RM_export_tool' into 'release/V2.5.3.x' 
MNT-20191 "Hotfix 2.5/ rm export tool"

See merge request records-management/records-management!1113
 2019-01-14 15:26:57 +00:00
Ross Gale
ceaa1ca14a RM-6702 Updating licence headers 2019-01-14 10:02:48 +02:00
Ross Gale
77d73283a1 Merge branch 'merge/RM-6702_LicenceUpdate' into 'master' 
Resolve RM-6702 "Merge/ licenceupdate"

Closes RM-6702

See merge request records-management/records-management!1110
 2019-01-04 15:25:54 +00:00
Ross Gale
c68c814513 RM-6702 updating headers to 2019 2019-01-04 15:25:11 +00:00
Ross Gale
2898fbb8a4 Record only merge of header update 2019-01-04 15:22:03 +00:00
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
Rodica Sutu
3088f0a4a4 Merge branch 'feature/RM_6591_Update_RuleDefinitions_ru' into 'master' 
RM-6591 Update RuleDefinitions action type

See merge request records-management/records-management!1105
 2018-10-25 12:42:36 +01:00
Rodica Sutu
a057f799cf Merge branch 'feature/RM_6591_Update_RuleDefinitions_ru' of https://git.alfresco.com/records-management/records-management into feature/RM_6591_Update_RuleDefinitions_ru 2018-10-25 12:46:50 +03:00
Rodica Sutu
ff0a24a577 Update the actions type from RuleDefinition class in order to be able to use it with other non-rm actions 2018-10-25 12:44:21 +03:00
Rodica Sutu
009ac8cf1c 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
b8be1e375e 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
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
c0fb76539b Merge remote-tracking branch 'remotes/origin/release/V3.0' 2018-10-01 18:03:18 +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
Rodica Sutu
7fbeccadbe 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
772ea923ce Record only merge of release/V3.0 into master 2018-09-06 10:03:08 +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
873470ec26 Merge changes from 2.6.1 release to master 2018-09-03 09:54:56 +03:00
cagache
a2a88cbede tag should be HEAD until next release 2018-08-31 17:28:57 +03:00