Commit Graph

6415 Commits

Author SHA1 Message Date
Claudia Agache
bf77bf7997 fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
e1b2a626cb Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-20822_CMIS_tests 2020-04-08 18:52:37 +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
rlucanu
55d037edd1 Merge pull request #1120 from Alfresco/feature-2.6/MNT-20822_CMIS_tests
Feature 2.6/mnt 20822 cmis tests
2020-04-08 14:43:37 +03:00
Roxana Lucanu
07c6e56704 RM-7145 Code review changes 2020-04-08 14:32:22 +03:00
Roxana Lucanu
5bc81482a4 RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
eb2e085dd6 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
Roxana Lucanu
235a2bc248 RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
6daf69afde Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +03:00
Claudia Agache
4c4b41bfb8 fix the parameter 2020-04-03 16:26:03 +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
Claudia Agache
8ec75aa6a1 Merge pull request #1115 from Alfresco/feature-2.6/RM-7148_UpdateACSVersion
Feature 2.6/rm 7148 update acs version
2020-04-03 15:22:27 +03:00
Claudia Agache
59feba75e4 code review comments 2020-04-03 14:51:02 +03:00
Claudia Agache
3b51ce4966 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
019a9a0375 move the cmis query tests
add some additional usecase

(cherry picked from commit d3284b1400)
2020-04-03 09:30:52 +03:00
Claudia Agache
bc7aa82479 Revert "Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'"
This reverts commit 594931a1
2020-04-02 16:30:29 +03:00
Claudia Agache
3a0bfff79a Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/RM-7148_UpdateACSVersion 2020-04-02 14:34:02 +03:00
rlucanu
e51fb20ccb Merge pull request #1112 from Alfresco/feature-2.6/RM-7145_SearchQueryHasMoreItems
RM-7145 Fix for hasMoreItems
2020-04-02 13:23:18 +03:00
Tom Page
594931a1f2 Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'
RM-7119 Fix startup with ACS 5.2.7.

See merge request records-management/records-management!1393
2020-04-02 10:53:45 +03:00
rodicasutu
3fe01badff add the missing class 2020-04-02 08:34:34 +03: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
rodicasutu
9cb79e7b4b wip CMIS tests for MNT-20822 2020-04-01 08:59:06 +03:00
Roxana Lucanu
c4525dec49 RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03: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
6305967df6 Merge pull request #1110 from Alfresco/feature-2.6/RM-7131_UpdateOldGitlabRefs_no
RM-7131 Update old gitlab repo links with the new one from github
2020-03-24 15:33:13 +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
6e6d05e395 Merge branch 'merge-3.2/RM-7119_startUpFix' into 'release/V3.2'
Resolve RM-7119 "Merge 3.2/ startupfix"

See merge request records-management/records-management!1397
2020-03-04 08:18:28 +00:00
Tom Page
0aac29261b Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
e5a1a24b29 Merge branch 'merge-3.1/RM-7119_startUpFix' into 'release/V3.1'
Resolve RM-7119 "Merge 3.1/ startupfix"

See merge request records-management/records-management!1396
2020-03-03 11:56:35 +00:00
Tom Page
51f4afbc1b Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
f9daf7c9c2 Merge branch 'merge-3.0/RM-7119_StartUpFix' into 'release/V3.0'
Resolve RM-7119 "Merge 3.0/ startupfix"

See merge request records-management/records-management!1395
2020-02-28 12:42:32 +00:00
Tom Page
c40cf70c96 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
ad4fce6bc3 Merge branch 'feature-2.7/RM-7119_ACS527StartUpFix' into 'release/V2.7'
RM-7119 Fix startup with ACS 5.2.7.

See merge request records-management/records-management!1393
2020-02-28 08:06:16 +00: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
ae3b493841 Record only merge of version change. 2020-02-26 15:44:32 +02:00
Rodica Sutu
0920fd7f5b Merge branch 'merge-3.2/MNT-21292_DownloadViaPost' into 'release/V3.2'
Resolve MNT-21292 "Merge 3.2/ downloadviapost"

See merge request records-management/records-management!1391
2020-02-26 12:42:20 +00: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
9e336a4edf Merge branch 'hotfix-3.2/MNT-21292_DownloadsViaPostForRecord' into 'release/V3.2.0.x'
Resolve MNT-21292 "Hotfix 3.2/ downloadsviapostforrecord"

See merge request records-management/records-management!1388
2020-02-24 10:52:15 +00: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