Commit Graph

2040 Commits

Author SHA1 Message Date
Claudia Agache
b8acf45b53 Mock search language to afts 2020-04-13 15:31:23 +03:00
Claudia Agache
3e5d9d6ba3 Revert "Deleting tests because there's no version of ACS community that supports this yet"
This reverts commit c7a55840
2020-04-12 19:13:09 +03:00
Claudia Agache
daa8e97684 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
1b5ff187db 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
8705f27222 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
a2a60a50ac 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
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e 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
ehardon
9ef1db7005 RM-6645: Added DelegateAction beans for archive and restore glacier actions
- added actions in the rules page
- added actions definitions and title
2020-04-07 17:53:29 +03:00
Claudia Agache
d222954e15 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
25f87a54ce 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
f25e12939e RM-7145 Wire in RM AuthenticationUtil. 2020-04-01 15:34:25 +01:00
Tom Page
2f476bdb0d RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Roxana Lucanu
c4525dec49 RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Claudia Agache
cc31204ddf Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/RM-7131_UpdateOldGitlabRefs_no
# Conflicts:
#	pom.xml
2020-03-25 10:25:42 +02:00
Claudia Agache
b12bdf2349 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/RM-7131_UpdateOldGitlabRefs_no
# Conflicts:
#	pom.xml
2020-03-25 08:20:19 +02:00
Claudia Agache
0e145ac759 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7131_UpdateOldGitlabRefs_no
# Conflicts:
#	pom.xml
2020-03-24 20:41:46 +02:00
Claudia Agache
16bede5478 Merge remote-tracking branch 'remotes/origin/release/V3.0' into release/V3.1
# Conflicts:
#	pom.xml
2020-03-24 20:27:31 +02:00
Claudia Agache
d6196537d3 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-7131_UpdateOldGitlabRefs_no
# Conflicts:
#	pom.xml
2020-03-24 17:30:17 +02:00
Claudia Agache
6f2d4f4b8f RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 16:18:35 +02:00
Claudia Agache
e3dad2b924 Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.7/RM-7131_UpdateOldGitlabRefs_no
# Conflicts:
#	README.txt
#	pom.xml
2020-03-24 15:40:05 +02:00
Claudia Agache
50cced2cb6 RM-7131 Update old gitlab repo links with the new one from github 2020-03-24 12:34:57 +02:00
Tom Page
47450b33b9 Merge release/V3.3 into master. 2020-03-04 15:53:21 +00:00
Tom Page
e25afe95f5 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00:00
Tom Page
0aac29261b Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
51f4afbc1b Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
c40cf70c96 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Rodica Sutu
6967d1d79d Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/MNT-21992_DownloadRecords 2020-02-27 14:07:03 +02:00
Tom Page
0e7ac0f0c5 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
db852d52e5 RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Rodica Sutu
262e4ab88f Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/MNT-21292_DownloadRecords 2020-02-26 14:59:41 +02:00
alfresco-build
51bce3a71f [maven-release-plugin] prepare for next development iteration 2020-02-26 12:04:24 +00:00
alfresco-build
a55d99322c [maven-release-plugin] prepare release V3.2.0.1 2020-02-26 12:04:18 +00:00
Rodica Sutu
439a9e959a use 6.1.1 community libraries 2020-02-25 17:50:58 +02:00
Rodica Sutu
4231886d11 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
b719e97bd7 Merge branch 'feature/RM-7012_ActionNameInListOfValuesForAudit' into 'master'
RM-7012

See merge request records-management/records-management!1280

(cherry picked from commit 2b7caed6aa)
2020-02-21 15:04:35 +02:00
Rodica Sutu
ab196dd083 move test DownloadAsZipRecordTest into rm enterprise package as there is no ACS 6.1.1 community equivalent and the issue is not reproducing with ACS community 6.1.2-ga 2020-02-21 11:23:32 +02:00
Rodica Sutu
4e24830ca2 revert unwanted changes 2020-02-20 12:53:54 +02:00
Rodica Sutu
76be91b8e2 update the ACS library versions in order to have the changes that cause download post to work 2020-02-20 10:11:22 +02:00
Rodica Sutu
e50ab2bf27 Merge branch 'feature/RM-7006_UpdateToACS611' into 'master'
RM-7006 Update to ACS 6.1.1

Closes RM-7006

See merge request records-management/records-management!1272
2020-02-19 19:56:11 +02:00
Rodica Sutu
a94353e78a 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
1d50d5b3d5 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
6c57774ca7 Update license headers 2020-02-18 11:10:36 +02:00
Sara Aspery
2933ce1e6c Merge branch 'release/V3.1' into release/V3.2 2020-02-18 11:07:45 +02:00
Ramona Popa
7d274d351c RM-7111: AGS 3.3 can't be installed on ACS 6.1
- added alfresco.min.version to 6.1
2020-02-10 12:13:10 +00:00
Ramona Popa
0f7cc3b94c 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
c2a5c3f9ce Merge branch 'release/V3.3' into merge/RM-7065_RetentionScheduleInheritance 2020-01-29 13:50:44 +02:00
Roxana Lucanu
62a72fba4f Merge branch 'release/V3.2' into merge-3.3/RM-7065_RetentionScheduleInheritance 2020-01-29 09:36:53 +02:00
Roxana Lucanu
d7b0c08916 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
6a65308383 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00