Commit Graph

6805 Commits

Author SHA1 Message Date
alfresco-build
fe482e57ec [maven-release-plugin] prepare for next development iteration 2020-08-12 11:59:57 +01:00
alfresco-build
17cf4a4f2e [maven-release-plugin] prepare release V3.4.0-RC3 2020-08-12 11:59:46 +01:00
alfresco-build
821d814dfe [maven-release-plugin] prepare for next development iteration 2020-08-12 10:45:48 +01:00
alfresco-build
00ce251625 [maven-release-plugin] prepare release V3.4.0-RC2 2020-08-12 10:45:38 +01:00
alfresco-build
b0e953d5a3 [maven-release-plugin] prepare for next development iteration 2020-08-12 08:49:55 +01:00
alfresco-build
792445cdb3 [maven-release-plugin] prepare release V3.4.0-RC1 2020-08-12 08:49:43 +01:00
Claudia Agache
ca87a1e3bb Merge pull request #1192 from Alfresco/feature/APPS-349_UseACS6.2.2
Use ACS 6.2.2
2020-08-11 15:14:39 +03:00
Claudia Agache
a522258bf5 Use ACS 6.2.2 2020-08-11 11:34:29 +03:00
evasques
312ec2f4c3 Merge pull request #1182 from Alfresco/hotfix-3.2/MNT-21585_fix_ipr_group_match
MNT-21585 - Having EVERYONE in original ACL causes IPR duplication (#…
2020-08-10 11:10:21 +01:00
estan
e30833134e APPS-291 Java API Development 2020-08-05 13:37:32 +03:00
estan
01e30a93ae Merge branch 'master' into feature/APPS-260 2020-08-04 11:27:41 +03:00
Rodica Sutu
4cd801f5bc Merge pull request #1179 from Alfresco/feature/APPS-282_TestsForWormRestriction
Feature/apps 282 tests for worm restriction
2020-07-31 13:33:25 +03:00
estan
d62c522d7a APPS-291 Java API Development 2020-07-30 12:17:06 +03:00
Elena Hardon
a31208ace9 Merge pull request #1175 from Alfresco/feature/APPS-276_RestrictionsForWORM_no
Added behavior bean for WORM locking
2020-07-30 11:25:28 +03:00
evasques
61da55e289 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
2020-07-29 13:21:33 +01:00
rodicasutu
ee460fdae1 fix the retention schedule tests 2020-07-29 09:35:10 +03:00
rodicasutu
d4a487abf0 Merge remote-tracking branch 'remotes/origin/feature/APPS-276_RestrictionsForWORM_no' into feature/APPS-282_TestsForWormRestriction 2020-07-28 17:14:01 +03:00
rodicasutu
add4441365 address code review comments 2020-07-28 15:27:46 +03:00
ehardon
da49f0b603 Merge remote-tracking branch 'origin/master' into feature/APPS-276_RestrictionsForWORM_no 2020-07-28 15:23:21 +03:00
rodicasutu
10cfcdb14e fix copy to test 2020-07-27 16:17:16 +03:00
rodicasutu
0f1a573a5b Merge remote-tracking branch 'remotes/origin/feature/APPS-327' into feature/APPS-282_TestsForWormRestriction 2020-07-27 14:14:48 +03:00
rodicasutu
e6f63784cb Merge remote-tracking branch 'remotes/origin/feature/APPS-276_RestrictionsForWORM_no' into feature/APPS-282_TestsForWormRestriction
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/action-service.properties
2020-07-27 14:14:07 +03:00
ehardon
5fc7468670 Merge remote-tracking branch 'origin/master' into feature/APPS-276_RestrictionsForWORM_no
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/action-service.properties
2020-07-27 12:27:17 +03:00
rodicasutu
09192c72cc add tests for WORM Restrictions 2020-07-27 10:15:01 +03:00
Raluca Munteanu
d134dca9ea Merge branch 'master' into feature/APPS-327 2020-07-27 10:13:28 +03:00
rodicasutu
99a0602d55 Merge branch 'master' of https://github.com/Alfresco/governance-services into feature/APPS-282_TestsForWormRestriction
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/action-service.properties
2020-07-27 10:09:24 +03:00
Rodica Sutu
93fb00dd53 Merge pull request #1177 from Alfresco/feature/APPS-324_S3_MB_SUpport
Feature/apps 324 s3 mb s upport
2020-07-27 08:33:36 +03:00
rodicasutu
e144aa8a37 Merge remote-tracking branch 'remotes/origin/feature/APPS-276_RestrictionsForWORM_no' into feature/APPS-282_TestsForWormRestriction 2020-07-24 16:24:44 +03:00
rodicasutu
39de9f0856 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/APPS-282_TestsForWormRestriction 2020-07-24 16:21:05 +03:00
ehardon
80cb5aa243 Merge remote-tracking branch 'origin/master' into feature/APPS-276_RestrictionsForWORM_no 2020-07-24 14:03:17 +03:00
ehardon
400470b924 Merge remote-tracking branch 'origin/master' into feature/APPS-276_RestrictionsForWORM_no 2020-07-23 17:29:47 +03:00
Raluca Munteanu
d6e232e7d3 Merge branch 'master' into feature/APPS-327 2020-07-23 12:30:21 +03:00
rodicasutu
cc438b1503 Merge remote-tracking branch 'remotes/origin/master' into feature/APPS-324_S3_MB_SUpport 2020-07-23 09:43:17 +03:00
Rodica Sutu
cab8ac8af0 Merge pull request #1176 from Alfresco/feature/APPS-275_TestsForShareRuleUI
Feature/apps 275 tests for share rule ui
2020-07-23 09:34:17 +03:00
Raluca Munteanu
c273d428c6 APPS-327: Cannot create record folder within a record category that has a rule to lock the content 2020-07-23 01:18:14 +03:00
rodicasutu
2f740eca60 Merge branch 'feature/APPS-275_TestsForShareRuleUI' into feature/APPS-324_S3_MB_SUpport 2020-07-22 21:24:20 +03:00
rodicasutu
53b2284e27 fixes after merging the changes from master 2020-07-22 20:00:34 +03:00
rodicasutu
58f06c6d4b Merge remote-tracking branch 'remotes/origin/master' into feature/APPS-275_TestsForShareRuleUI 2020-07-22 19:16:09 +03:00
rodicasutu
b21a6a4050 tests for action restricted for worm lock records APS-256 2020-07-22 19:15:39 +03:00
rodicasutu
54323e5c51 Merge remote-tracking branch 'remotes/origin/master' into feature/APPS-282_TestsForWormRestriction 2020-07-22 14:32:48 +03:00
ramunteanu
fe903f6958 Merge pull request #1171 from Alfresco/feature/APPS-265
APPS-265: Java API Development
2020-07-22 14:24:53 +03:00
rodicasutu
f5cbe4b651 Merge remote-tracking branch 'remotes/origin/feature/APPS-265' into feature/APPS-282_TestsForWormRestriction 2020-07-22 11:55:47 +03:00
rodicasutu
10639f2c97 Merge remote-tracking branch 'remotes/origin/feature/APPS-265' into feature/APPS-324_S3_MB_SUpport 2020-07-22 11:54:06 +03:00
Raluca Munteanu
3f9c2f0433 APPS-265: Updates on UI side 2020-07-22 11:41:44 +03:00
rodicasutu
ea0c9a7628 Merge remote-tracking branch 'remotes/origin/feature/APPS-265' into feature/APPS-324_S3_MB_SUpport
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/action/WormLockAction.java
2020-07-22 10:11:47 +03:00
Elena Hardon
bab0affa77 Merge pull request #1174 from Alfresco/feature/APPS-270_AddLockActionRuleConfiguration
APPS-270: add WORM lock action to Rules configuration
2020-07-22 09:47:14 +03:00
ehardon
f4a0ddbdc1 Merge remote-tracking branch 'origin/feature/APPS-265' into feature/APPS-270_AddLockActionRuleConfiguration 2020-07-22 09:45:52 +03:00
rodicasutu
390a1dfeac Merge remote-tracking branch 'remotes/origin/feature/APPS-265' into feature/APPS-275_TestsForShareRuleUI 2020-07-21 15:42:10 +03:00
estan
908ff15fcf Merge branch 'merge-3.3/MNT-17946_CreateFullPath_no' 2020-07-21 15:21:04 +03:00
estan
d65ecbca27 Merge branch 'merge-3.2/MNT-17946_CreateFullPath_no' into merge-3.3/MNT-17946_CreateFullPath_no 2020-07-21 15:18:26 +03:00