inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,433 Commits 330 Branches 2,178 Tags
a19dcc435ff0051ccd01847c967723f7dfa3befc
Commit Graph

5433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Gale
ed3ef02729 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
375ca76ad0 RM-6702 updating headers to 2019 2019-01-04 15:25:11 +00:00
Ross Gale
66fda1b427 Record only merge of header update 2019-01-04 15:22:03 +00:00
Ross Gale
71b4a8e772 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
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
86becd973c Record only merge of header update 2019-01-04 12:21:27 +00:00
Ross Gale
13097ca79a 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
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
d017e70d6a Record only merge of header update 2019-01-04 09:39:14 +00:00
Ross Gale
a3949f5991 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
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Ross Gale
d35525203b Record only merge of header update 2019-01-03 14:20:58 +00:00
Ross Gale
4ceb3ddefb 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
1f2034b4fe RM-6702 Updating licence headers 2019-01-03 09:23:49 +00:00
Rodica Sutu
fa3424bf0a 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
c5f2f43411 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
0b4ef36671 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
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