Commit Graph

1144 Commits

Author SHA1 Message Date
Eva Vasques
d24f25f409 Merge remote-tracking branch 'origin/release/V3.0' into merge-3.1/MNT-21585 2020-06-16 14:31:37 +01:00
Roxana Lucanu
fe1dc3ac92 APPS-139 code review changes 2020-06-10 09:56:56 +03:00
Roxana Lucanu
bbdcfef32c APPS-139 added new specific capability 2020-06-09 21:26:07 +03:00
Eva Vasques
b204e65dd7 Merge remote-tracking branch 'origin/release/V2.7' into merge-3.0/MNT-21585 2020-06-09 17:20:15 +01:00
evasques
f425770211 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 c3cdd88873)

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

(cherry picked from commit 53f26b5793)

* [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
2132a7151a APPS-139 other code review comments 2020-06-09 14:29:51 +03:00
Roxana Lucanu
122671eb2c APPS-139 other code review comments 2020-06-04 18:55:56 +03:00
Roxana Lucanu
e0dd6a1bfa APPS-139 fix unit test 2020-06-04 10:49:57 +03:00
Roxana Lucanu
390106f9c6 APPS-139 changes around capabilities 2020-06-03 15:49:00 +03:00
Roxana Lucanu
a0455b6c9d APPS-139 code review comments 2020-06-02 19:02:07 +03:00
Roxana Lucanu
a76384b1eb APPS-139 added exception 2020-05-27 17:04:41 +03:00
Roxana Lucanu
e6ebe6f58e APPS-139 check capability 2020-05-27 09:23:22 +03:00
Claudia Agache
d9a88691cf File the declared record version if the destination record folder is specified 2020-05-21 13:10:37 +03:00
Roxana Lucanu
3d2d74a9d9 APPS-139 fixes 2020-05-20 21:16:34 +03:00
Roxana Lucanu
2447291a7a APPS-139 added backend functionality for Declare and file version as record 2020-05-20 15:55:57 +03:00
ehardon
96cb582aff Merge remote-tracking branch 'origin/master' into feature/RM-6645_ArchiveAndRestoreActionsInexistentInRMSite 2020-04-14 17:49:16 +03:00
ehardon
dac7a8bcf8 RM-6645: Added unit test for getRmActionDefinitions webscript when whitelisted actions are present 2020-04-14 17:22:33 +03:00
Claudia Agache
72ecf0d539 Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/RM-7148_RM-7145 2020-04-13 16:26:26 +03:00
Claudia Agache
20addc90ff Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/RM-7148_RM-7145
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java
2020-04-12 19:10:31 +03:00
Claudia Agache
01adc39a0a Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7148_RM-7145 2020-04-10 19:21:02 +03:00
ehardon
ea41e5c553 RM-6645: Created WhitelistedDMActions for RM site
- added whitelisted actions into the rm rule actions
2020-04-09 12:16:33 +03:00
Claudia Agache
9ec55438c5 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-08 18:50:29 +03:00
Claudia Agache
06d0f76284 Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
#	rm-enterprise/pom.xml
2020-04-08 15:14:00 +03:00
Claudia Agache
353ff7b8ee Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion
# Conflicts:
#	rm-enterprise/pom.xml
2020-04-03 16:21:40 +03:00
Tom Page
50dc9ad99d Fix cache in NodeTypeUtility to be thread safe.
Inspired by @cetra3 in PR: https://github.com/Alfresco/records-management/pull/8
2020-04-03 10:00:11 +01:00
Tom Page
98a1485baa RM-7145 Wire in RM AuthenticationUtil. 2020-04-01 15:34:25 +01:00
Tom Page
94b209e0ea RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Roxana Lucanu
7def9837ad RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Tom Page
2ce88dcc12 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00:00
Tom Page
44aa3b4f82 Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
56f1549d7d Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
eeb23b51e1 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
ddae9fbd64 RM-7119 Throw explicit exception rather than logging message.
Also address other code review comments.
2020-02-27 07:55:40 +00:00
Tom Page
ff9be3024b RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Rodica Sutu
da92ed7f3b Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/MNT-21292_DownloadRecords 2020-02-26 14:59:41 +02:00
Rodica Sutu
e30bc9510c Merge remote-tracking branch 'remotes/origin/release/V3.2.0.x' into merge-3.2/MNT-21292_DownloadViaPost
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/search/impl/solr/ExtendedSolrQueryHTTPClient.java
2020-02-24 15:26:38 +02:00
Rodica Sutu
098c80bd03 cherry pick
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/DownloadAsZipRecordTest.java
2020-02-18 16:32:43 +02:00
Rodica Sutu
49f504ba93 update the assoc policy for the case when the create assoc source node is not a file plan component node 2020-02-18 16:31:20 +02:00
Sara Aspery
2790244142 Update license headers 2020-02-18 11:10:36 +02:00
Sara Aspery
2d0913df35 Merge branch 'release/V3.1' into release/V3.2 2020-02-18 11:07:45 +02:00
Ramona Popa
741373a832 RM-7111: AGS 3.3 can't be installed on ACS 6.1
- added alfresco.min.version to 6.1
2020-02-05 12:28:31 +00:00
Roxana Lucanu
ad026aec83 Merge branch 'release/V3.2' into merge-3.3/RM-7065_RetentionScheduleInheritance 2020-01-29 09:36:53 +02:00
Roxana Lucanu
f78453a730 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
09769e3cc2 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00
Roxana Lucanu
8d31a0b57b RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
59e0979070 RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
b2011a8a52 Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"
This reverts merge request !1353
2020-01-27 08:43:09 +00:00
Roxana Lucanu
de34a72e33 Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'"
This reverts merge request !1350
2020-01-27 08:14:33 +00:00
Roxana Lucanu
db4dc1f016 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Tom Page
4b01395ae6 RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00