Commit Graph

6805 Commits

Author SHA1 Message Date
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
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
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
7f93695848 Merge branch 'merge/RM-7119_startUpFix' into 'master'
Resolve RM-7119 "Merge/ startupfix"

Closes RM-7119

See merge request records-management/records-management!1399
2020-03-06 08:22:23 +00:00
Tom Page
47450b33b9 Merge release/V3.3 into master. 2020-03-04 15:53:21 +00:00
Tom Page
18e3294a8f Merge branch 'merge-3.3/RM-7119_startUpFix' into 'release/V3.3'
Resolve RM-7119 "Merge 3.3/ startupfix"

See merge request records-management/records-management!1398
2020-03-04 15:52:43 +00:00
Tom Page
e25afe95f5 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00: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
Rodica Sutu
8c3d259750 Merge branch 'merge/MNT-21992_DownloadRecords' into 'master'
Resolve MNT-21992 "Merge/ downloadrecords"

Closes MNT-21992, MNT-21292, and RM-7006

See merge request records-management/records-management!1394
2020-02-27 19:25:58 +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
Rodica Sutu
1a8dea19ba Record only merge of version change. 2020-02-27 13:59:00 +02:00
Rodica Sutu
ab4a91f766 Merge branch 'merge-3.3/MNT-21292_DownloadRecords' into 'release/V3.3'
Resolve MNT-21292 "Merge 3.3/ downloadrecords"

See merge request records-management/records-management!1392
2020-02-27 11:56:17 +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
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
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
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
Roxana Lucanu
5d11691353 Record only merge 2020-02-19 10:32:35 +02:00
Roxana Lucanu
fff717b9b1 Record only merge 2020-02-19 10:25:14 +02:00
Rodica Sutu
ec5693c178 Record only merge headers update. 2020-02-19 08:50:53 +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
Rodica Sutu
424707c740 Merge branch 'hotfix-3.2/MNT-21292_UpdateHeadersCherryPick' into 'release/V3.2.0.x'
Hotfix 3.2/ updateheaderscherrypick"

See merge request records-management/records-management!1386
2020-02-18 14:16:14 +00: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
Claudia Agache
dec66f6358 Record only merge 2020-02-11 06:34:26 +00:00