Commit Graph

6147 Commits

Author SHA1 Message Date
Ross Gale
81aa1f2c5c RM-6993 replace old assoc with new 2019-10-08 13:25:30 +01:00
Ross Gale
07383d7e77 RM-6993 revert change to depricated assoc 2019-10-08 11:57:30 +01:00
Ross Gale
56a5da0154 RM-6993 create new assoc 2019-10-08 11:55:47 +01:00
Tom Page
763ba1b319 Merge release/V2.6.0.x into release/V2.6. 2019-10-04 16:00:55 +01:00
Tom Page
5f87a5cd92 Update license headers. 2019-10-02 14:58:48 +01:00
Ross Gale
78cfa3a879 Merge remote-tracking branch 'origin' into feature/RM-6928_Renditions 2019-09-27 11:03:15 +01:00
Tom Page
c2e2536389 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
dc031c1317 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
0616a1070d Remove duplicate unnecessary configuration for stop db/amq. 2019-09-25 13:51:11 +01:00
Tom Page
8c16f9351f 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
4461495d85 Fix start/stop db to be in a pluginManagement section. 2019-09-25 10:20:13 +01:00
Tom Page
2cdfdf5037 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
43c29299d1 Remove unused property. 2019-09-25 09:07:18 +01:00
Tom Page
df16478e53 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
d50b552be6 RM-6928 adding check to allow specified properties on frozen nodes to be updated 2019-09-24 16:45:51 +01:00
Tom Page
067cae1cd2 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
c2a27f6370 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
756208affb 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
26f664c68f 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
3a6b3c994a 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
7dd104c28e 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
8d6c50f8d1 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
414be241a4 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
703f706afc RM-6949 rebase 2019-09-17 11:01:07 +01:00
Ramona Popa
c9fc6baeb8 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
066503b515 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
0a1cfa0d11 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
e3e3273ab0 RM-6943 other code review comments 2019-09-13 16:26:27 +03:00
rlucanu
d2c2f14270 RM-6943 code review changes 2019-09-13 13:44:01 +03:00
Ramona Popa
8b14d81e1e 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
25ef9dcb75 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-13 09:00:27 +03:00
Ramona Popa
a2be7a29f9 RM-6945: Display available actions on held active content inside a hold
- updated actions
2019-09-13 08:59:59 +03:00
rlucanu
4b1fec979a RM-6943 added RemoveFromHold evaluator 2019-09-12 17:04:33 +03:00
Ramona Popa
e59b169422 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
50f2457a52 RM-6945: Display available actions on held active content inside a hold
- fixed actions
2019-09-12 16:21:23 +03:00
rlucanu
0523ca1d5c RM-6943 Changes on AddToHold evaluator 2019-09-12 12:20:51 +03:00
Ramona Popa
48d8f66046 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
7a8273645d 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
5183b6c389 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-10 23:02:19 +03:00
Ramona Popa
cb4c0ef37f 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
rlucanu
c369d53d7c Merge 'origin/master' into feature/RM-6943_AddoToHoldActionInCollabSite 2019-09-10 15:10:15 +03:00
Rodica Sutu
28b1fc7d9c Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-10 09:16:48 +03:00
Claudia Agache
8787bd09e4 Merge branch 'feature/RM-6918_ViewHoldContentTests' into 'master'
RM-6918 View Hold Contents tests

Closes RM-6918

See merge request records-management/records-management!1227
2019-09-10 07:08:09 +01:00
Sara Aspery
41d0404d4f Merge branch 'feature/RM-6915_ViewContentsOfLegalHoldUI' into 'master'
Resolve RM-6915 "Feature/ viewcontentsoflegalholdui"

Closes RM-6915

See merge request records-management/records-management!1226
2019-09-09 20:57:03 +01:00
Ramona Popa
b8963f75c8 RM-6945: Display available actions on held active content inside a hold
- added actions for isFreezeActiveContent
2019-09-09 22:10:55 +03:00
Rodica Sutu
3c957afdbe remove unwanted changes 2019-09-09 13:31:35 +03:00
Rodica Sutu
9588917c66 Merge remote-tracking branch 'remotes/origin/feature/RM-6918_ViewHoldContentTests' into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-09 13:24:25 +03:00
Rodica Sutu
5334623e56 add tests to Bulk Remove from Hold 2019-09-09 12:55:32 +03:00
rlucanu
7e79c86baf RM-6943 adding implementation for AddToHold evaluator 2019-09-06 16:58:52 +03:00
cagache
bc2f13e0f7 Code review comments 2019-09-06 08:50:49 +03:00