Commit Graph

6007 Commits

Author SHA1 Message Date
cagache
ae681f74ce Record only merge. 2019-10-10 17:17:44 +03:00
cagache
05f760abb1 Record only merge. 2019-10-10 17:15:46 +03:00
alfresco-build
ca60dec1cd [maven-release-plugin] prepare for next development iteration 2019-10-10 13:19:15 +01:00
alfresco-build
2852f215cf [maven-release-plugin] prepare release V2.6.0.1 2019-10-10 13:19:11 +01:00
Tom Page
9e141ac423 Record-only merge release/V2.7.2.x into release/V2.7. 2019-10-10 08:52:45 +01:00
alfresco-build
b33de0b62b [maven-release-plugin] prepare for next development iteration 2019-10-09 15:23:26 +01:00
alfresco-build
707adc8d5b [maven-release-plugin] prepare release V2.7.2.2 2019-10-09 15:23:22 +01:00
Ramona Popa
1d1de9d521 Merge branch 'feature/RM-7001_GenerateHoldReportActiveContent' into 'master'
RM-7001: Generate Hold Report fails for a hold if has active content

Closes RM-7001

See merge request records-management/records-management!1266
2019-10-08 18:38:28 +01:00
Ramona Popa
b30bc712a1 RM-700: Generate Hold Report fails for a hold if has active content
- check if rma:identifier property exists
2019-10-08 18:38:28 +01:00
Tom Page
05731c3c0c Merge branch 'merge-2.6/MNT-20680_ClusteredCaching' into 'release/V2.6'
Resolve MNT-20680 "Merge 2.6/ clusteredcaching"

See merge request records-management/records-management!1262
2019-10-08 16:42:37 +01:00
Ross Gale
7133ecc84f RM-6993 replace old assoc with new 2019-10-08 13:25:30 +01:00
Ross Gale
255ea77362 RM-6993 revert change to depricated assoc 2019-10-08 11:57:30 +01:00
Ross Gale
a54a9a897d RM-6993 create new assoc 2019-10-08 11:55:47 +01:00
Tom Page
9a41897b1b Merge release/V2.6.0.x into release/V2.6. 2019-10-04 16:00:55 +01:00
Tom Page
156da02c65 Update license headers. 2019-10-02 14:58:48 +01:00
Ross Gale
978bb9e781 Merge remote-tracking branch 'origin' into feature/RM-6928_Renditions 2019-09-27 11:03:15 +01:00
Tom Page
1185eba00b Merge branch 'feature/DockerMavenPlugin' into 'master'
Use docker-maven-plugin rather than fabric8-maven-plugin.

See merge request records-management/records-management!1241
2019-09-27 08:59:18 +01:00
Tom Page
9e2def31a3 Merge branch 'feature/DeclareJava11' into 'master'
Set declared Java version to 11.

See merge request records-management/records-management!1238
2019-09-26 08:16:31 +01:00
Tom Page
45802b1a9c Remove duplicate unnecessary configuration for stop db/amq. 2019-09-25 13:51:11 +01:00
Tom Page
659955e8a5 Make all configuration execution specific.
This introduces some duplication for the start/stop db executions, but
I can't see any way to avoid that. We don't want the other
configuration being shared between executions.

Ensure the db start/stop execution triggers for repo and not for share.
2019-09-25 11:51:03 +01:00
Tom Page
ba5be75a59 Fix start/stop db to be in a pluginManagement section. 2019-09-25 10:20:13 +01:00
Tom Page
6573eaa4a9 Build docker images during verify phase.
This avoids needing to update the build plans, which expect the docker image to be built during the verify phase.
2019-09-25 10:07:30 +01:00
Tom Page
5c993bed8b Remove unused property. 2019-09-25 09:07:18 +01:00
Tom Page
ccd0fbf737 Convert start/stop db into a profile.
Now we're using the docker-maven-plugin for building images and also
for starting/stopping the db, we need to ensure we don't skip it at
the wrong time. It's simpler to avoid using the <skip> element at all,
and instead use a profile based on the skip.integrationtests property
so that we only start the db when running integration tests.
2019-09-25 08:40:53 +01:00
Ross Gale
87ff9e6fc8 RM-6928 adding check to allow specified properties on frozen nodes to be updated 2019-09-24 16:45:51 +01:00
Tom Page
5d2c61ee63 Use docker-maven-plugin rather than fabric8-maven-plugin.
This removes any attempts to connect to kubernetes clusters which can take considerable time.
2019-09-24 15:51:14 +01:00
Tom Page
06016cd2b5 Set declared Java version to 11.
This should ensure that IDEs default to the correct Java version.
2019-09-20 16:00:11 +01:00
Rodica Sutu
a6fe18ed52 Merge branch 'feature/RM-6856_BulkRemovalFromHold_Tests' into 'master'
Resolve RM-6940 "Automate AC for Bulk removal of items"

Closes RM-6940 and RM-6856

See merge request records-management/records-management!1229
2019-09-19 19:53:15 +01:00
Rodica Sutu
6737125c23 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-18 21:27:59 +03:00
Meenal Bhave
5ce1853866 Merge branch 'feature/Search-1835-IE-GS-Compatibility' into 'master'
Search-1835: Updated GS Automation to use TAS Rest API Version 6.0.1.2

See merge request records-management/records-management!1232
2019-09-18 09:52:53 +01:00
Meenal Bhave
7ea313e7f8 Search-1835: Updated GS Automation to use TAS Rest API Version 6.0.1.2, to be used with IE automation 2019-09-18 09:52:53 +01:00
Rodica Sutu
7ac135dab1 Merge remote-tracking branch 'remotes/origin/feature/RM-6949_DropDown' into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-17 13:57:14 +03:00
Rodica Sutu
a1913abe20 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-17 13:56:53 +03:00
Ross Gale
45418a4aa7 RM-6949 rebase 2019-09-17 11:01:07 +01:00
Ramona Popa
83cd66a27c Merge branch 'feature/RM-6945_DisplayActionForHeldAContentInHold' into 'master'
RM-6945: Display available actions on held active content inside a hold

Closes RM-6945

See merge request records-management/records-management!1230
2019-09-16 09:08:14 +01:00
Ramona Popa
5f95f4cbdb RM-6945: Display available actions on held active content inside a hold
- added actions for isFreezeActiveContent
2019-09-16 09:08:14 +01:00
Roxana Lucanu
79fffedd88 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into 'master'
RM-6943 AddTo/RemoveFrom hold actions from a collaboration site

Closes RM-6943

See merge request records-management/records-management!1228
2019-09-16 07:22:54 +01:00
rlucanu
daabfb5047 RM-6943 other code review comments 2019-09-13 16:26:27 +03:00
rlucanu
c81e054152 RM-6943 code review changes 2019-09-13 13:44:01 +03:00
Ramona Popa
c9d25d5971 RM-6945: Display available actions on held active content inside a hold
- updated actions for document library
2019-09-13 10:12:39 +03:00
Ramona Popa
db9f55822e Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-13 09:00:27 +03:00
Ramona Popa
d0f3e1124d RM-6945: Display available actions on held active content inside a hold
- updated actions
2019-09-13 08:59:59 +03:00
rlucanu
12e1eeea85 RM-6943 added RemoveFromHold evaluator 2019-09-12 17:04:33 +03:00
Ramona Popa
f75e0f700a Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
2019-09-12 16:26:40 +03:00
Ramona Popa
11c0b7dbee RM-6945: Display available actions on held active content inside a hold
- fixed actions
2019-09-12 16:21:23 +03:00
rlucanu
df5a142b43 RM-6943 Changes on AddToHold evaluator 2019-09-12 12:20:51 +03:00
Ramona Popa
a10acd43f3 RM-6945: Display available actions on held active content inside a hold
- added uiType frozen content
2019-09-11 16:26:56 +03:00
Ramona Popa
9e4c04c44f RM-6945: Display available actions on held active content inside a hold
- reverted allow method to be executed by non rm
2019-09-11 11:23:53 +03:00
Ramona Popa
523dad44bb Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-10 23:02:19 +03:00
Ramona Popa
041bc9071b RM-6945: Display available actions on held active content inside a hold
- allow method to be executed by non rm
2019-09-10 23:00:53 +03:00