Commit Graph

6147 Commits

Author SHA1 Message Date
ehardon
dac7a8bcf8 RM-6645: Added unit test for getRmActionDefinitions webscript when whitelisted actions are present 2020-04-14 17:22:33 +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
ehardon
67beca33d4 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
Tom Page
51b38e5da0 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
e0b1d3d66c Merge release/V3.3 into master. 2020-03-04 15:53:21 +00:00
Tom Page
8dce4e8391 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
2ce88dcc12 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00:00
Tom Page
e986ac4d36 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
44aa3b4f82 Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
8b08178559 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
56f1549d7d Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
90fa2711dd 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
eeb23b51e1 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
a03c61b241 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
e938da96ae 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
a9b3c5d76d Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/MNT-21992_DownloadRecords 2020-02-27 14:07:03 +02:00
Rodica Sutu
5a848b7bbe Record only merge of version change. 2020-02-27 13:59:00 +02:00
Rodica Sutu
a0059bc9fb 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
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
a71d8659b9 Record only merge of version change. 2020-02-26 15:44:32 +02: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
4c9bc2157d 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
5b34dbd24f [maven-release-plugin] prepare for next development iteration 2020-02-26 12:04:24 +00:00
alfresco-build
783dcc7710 [maven-release-plugin] prepare release V3.2.0.1 ags-3.2.0.1 2020-02-26 12:04:18 +00:00
Rodica Sutu
11e9c8fc63 use 6.1.1 community libraries 2020-02-25 17:50:58 +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
7604b96b88 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
e78f159844 Merge branch 'feature/RM-7012_ActionNameInListOfValuesForAudit' into 'master'
RM-7012

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

(cherry picked from commit a3450f74cf)
2020-02-21 15:04:35 +02:00
Rodica Sutu
43268debd3 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
b2b0121d20 revert unwanted changes 2020-02-20 12:53:54 +02:00
Rodica Sutu
738fce1c37 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
1292cb495b 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
e137861893 Record only merge 2020-02-19 10:32:35 +02:00
Roxana Lucanu
154f2c6d69 Record only merge 2020-02-19 10:25:14 +02:00
Rodica Sutu
474eb8e7c4 Record only merge headers update. 2020-02-19 08:50:53 +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
Rodica Sutu
d85d6227ce 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
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
Claudia Agache
42e24ac535 Record only merge 2020-02-11 06:34:26 +00:00
Ramona Popa
c8881ce6da Merge branch 'feature/merge_RM-7111_from_3.3' into 'master'
Feature/merge rm 7111 from 3.3

Closes RM-7108

See merge request records-management/records-management!1379
2020-02-10 12:13:10 +00:00
Ramona Popa
dea88eee54 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
Claudia Agache
d9812971f8 Record only merge. 2020-02-06 13:07:59 +00:00
Claudia Agache
777e5a1851 Record only merge. 2020-02-06 13:06:11 +00:00
Claudia Agache
f5561af595 Record only merge. 2020-02-06 12:58:24 +00:00
Rodica Sutu
27657b7d1a Merge branch 'feature/RM-7053_FixCmisQueryTest' into 'master'
Resolve RM-7053 "Feature/ fixcmisquerytest"

Closes RM-7053

See merge request records-management/records-management!1372
2020-02-05 14:36:32 +00:00
Ramona Popa
b9d60991db Record only merge of version change. 2020-02-05 14:32:41 +02:00
Ramona Popa
23a9d59460 Merge branch 'feature-3.3/merge_3.3.0.x_to_3.3' into 'release/V3.3'
Feature 3.3/merge 3.3.0.x to 3.3

See merge request records-management/records-management!1377
2020-02-05 12:28:31 +00:00