Commit Graph

6805 Commits

Author SHA1 Message Date
evasques
bba7f1e704 Merge pull request #1149 from Alfresco/merge-3.0/MNT-21585
MNT-21585 - Merge release/V2.7 into release/V3.0
2020-06-16 14:24:00 +01:00
Claudia Agache
1dbc20834c Merge remote-tracking branch 'remotes/origin/feature/APPS-37_DeclareAndFileAsRecordUI' into feature/APPS-41_DeclareAndFileAsRecordRuleTests 2020-06-16 15:04:24 +03:00
Claudia Agache
ab23cbbd64 Merge remote-tracking branch 'remotes/origin/master' into feature/APPS-41_DeclareAndFileAsRecordRuleTests 2020-06-16 12:56:20 +03:00
ehardon
5bd4d1309d Merge remote-tracking branch 'origin/master' into feature-3.3/APPS-37_DeclareAndFileAsRecordUi 2020-06-16 10:51:45 +03:00
ehardon
846fd60183 WIP APPS-37: Declare and File as Record add select folder button 2020-06-16 10:51:03 +03:00
Claudia Agache
a544855bb2 Merge pull request #1143 from Alfresco/feature/APPS-172_RemoveDeclareAsActions
Remove old Declare as record and Declare version as record actions
2020-06-15 15:17:52 +03:00
Rodica Sutu
bca4e70dcc Merge pull request #1140 from Alfresco/feature/APPS-145_AutomatedTests
Feature/apps 145 automated tests
2020-06-15 08:31:08 +03:00
rodicasutu
c76c8ab096 update step information 2020-06-12 13:46:55 +03:00
Claudia Agache
4b15034471 Merge remote-tracking branch 'remotes/origin/feature/APPS-145_AutomatedTests' into feature/APPS-172_RemoveDeclareAsActions 2020-06-12 11:20:09 +03:00
rodicasutu
4a42429fc6 Merge branch 'master' of https://github.com/Alfresco/governance-services into feature/APPS-145_AutomatedTests 2020-06-11 11:13:42 +03:00
Claudia Agache
5bfccda15f Merge remote-tracking branch 'remotes/origin/master' into feature/APPS-172_RemoveDeclareAsActions 2020-06-11 09:53:38 +03:00
rlucanu
e21730b688 Merge pull request #1141 from Alfresco/feature/APPS-139_DeclareAndFileVersionAsRecord
Feature/apps 139 declare and file version as record
2020-06-10 15:19:44 +03:00
rodicasutu
298c8a48cb updates according to the latest changes 2020-06-10 13:57:19 +03:00
rodicasutu
aec1034b46 Merge branch 'feature/APPS-145_AutomatedTests' of https://github.com/Alfresco/governance-services into feature/APPS-145_AutomatedTests 2020-06-10 13:04:54 +03:00
rodicasutu
5300ab7829 Merge branch 'master' of https://github.com/Alfresco/governance-services into feature/APPS-145_AutomatedTests 2020-06-10 11:55:35 +03:00
Tom Page
0aa5fd9d0a Merge pull request #1119 from Alfresco/feature/FallbackToDeleteAllImages
If deleting specified images fails then try deleting all images instead.

(cherry picked from commit 5e41d17941976f23ee9753b2b9f93d8ee0a874b1)
2020-06-10 08:37:39 +01:00
Tom Page
23abe311a5 Record-only merge release/V2.7 into merge-3.0/MNT-21585. 2020-06-10 08:33:20 +01:00
Tom Page
0d4283aeb7 Record-only merge release/V2.7.0.x into release/V2.7. 2020-06-10 08:31:35 +01:00
Roxana Lucanu
18c9059a85 APPS-139 code review changes 2020-06-10 09:56:56 +03:00
Roxana Lucanu
23d48bcf2e APPS-139 fix unit test 2020-06-10 08:53:58 +03:00
Roxana Lucanu
11b2a84e7e APPS-139 added new specific capability 2020-06-09 21:26:07 +03:00
Eva Vasques
dad6782b1d Merge remote-tracking branch 'origin/release/V2.7' into merge-3.0/MNT-21585 2020-06-09 17:20:15 +01:00
evasques
109f416d0f Merge release/V2.7.0.x into release/V2.7 (#1146)
* Update copyright header for 2020.

* MNT-21585 - Having EVERYONE in original ACL causes IPR duplication (#1144)

* MNT-21585 - Having EVERYONE in original authorities causes IPR duplication

* Update License Headers

* prevent NPE when authorities is null and refactored findIPRGroup method

* RM-7131 Update old gitlab repo links with the new one from github

(cherry picked from commit 50cced2cb6)

* Change SCM URLs in order to switch to SSH authentication with 2FA for Github

(cherry picked from commit 7541e46ac4)

* [maven-release-plugin] prepare release V2.7.0.2

* [maven-release-plugin] prepare for next development iteration

Co-authored-by: Tom Page <thomas.page@alfresco.com>
Co-authored-by: Claudia Agache <claudia.agache@ness.com>
Co-authored-by: alfresco-build <info@alfresco.com>
2020-06-09 17:17:49 +01:00
Roxana Lucanu
06de12a10c APPS-139 other code review comments 2020-06-09 14:29:51 +03:00
alfresco-build
7d2a279188 [maven-release-plugin] prepare for next development iteration 2020-06-09 09:15:51 +01:00
alfresco-build
152b10c328 [maven-release-plugin] prepare release V2.7.0.2 2020-06-09 09:15:40 +01:00
Tom Page
746dac2988 Merge release/V3.3 into master. 2020-06-09 08:54:55 +01:00
Tom Page
9795a79c40 Merge release/V3.2 into release/V3.3. 2020-06-09 08:53:53 +01:00
Tom Page
7bfbfea095 Merge release/V3.3.1.x into release/V3.3. 2020-06-09 08:53:53 +01:00
Tom Page
3473ea1539 Merge release/V3.3.0.x into release/V3.3. 2020-06-09 08:53:53 +01:00
Claudia Agache
1aa7b7db26 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:48 +01:00
Claudia Agache
d6312dcd3d Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:43 +01:00
Tom Page
6f4446142e Merge release/V3.1 into release/V3.2. 2020-06-09 08:53:38 +01:00
Tom Page
145e0e5192 Merge release/V3.2.0.x into release/V3.2. 2020-06-09 08:53:38 +01:00
Claudia Agache
934eeb14e4 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:33 +01:00
Tom Page
464172e341 Merge release/V3.0 into release/V3.1. 2020-06-09 08:53:27 +01:00
Tom Page
d11500f644 Merge release/V3.1.0.x into release/V3.1. 2020-06-09 08:53:27 +01:00
Claudia Agache
3cc75bfe61 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:22 +01:00
Tom Page
589b987f79 Merge release/V2.7 into release/V3.0. 2020-06-09 08:53:16 +01:00
Tom Page
4f26d592ef Merge release/V3.0.2.x into release/V3.0. 2020-06-09 08:53:16 +01:00
Tom Page
5f2d90bbc1 Merge release/V3.0.1.x into release/V3.0. 2020-06-09 08:53:15 +01:00
Tom Page
4730ca34a9 Merge release/V3.0.0.x into release/V3.0. 2020-06-09 08:53:15 +01:00
Claudia Agache
e57bb125d6 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:10 +01:00
Claudia Agache
10944032cd Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:05 +01:00
Claudia Agache
06b3fb165c Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:59 +01:00
Tom Page
6fb066b05a Merge release/V2.6 into release/V2.7. 2020-06-09 08:52:54 +01:00
Tom Page
aa896a3ad8 Merge release/V2.7.2.x into release/V2.7. 2020-06-09 08:52:53 +01:00
Tom Page
4490346bad Merge release/V2.7.1.x into release/V2.7. 2020-06-09 08:52:53 +01:00
Claudia Agache
4a55b6659a Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:48 +01:00
Claudia Agache
467e9d1ca1 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:42 +01:00