Commit Graph

6147 Commits

Author SHA1 Message Date
Ross Gale
bf7047745a Update rm-patch-v32-context.xml 2019-10-18 14:33:16 +01:00
Ross Gale
6792522163 RM-7014 code review comments 2019-10-18 14:26:48 +01:00
Ross Gale
6c1808731b RM-7014 add code to check an rm site has been created before running the patches that require an rm site 2019-10-17 17:49:01 +01:00
Ramona Popa
e6983ce90f Merge branch 'feature/RM-7003_UpgradeGenerateHoldReportTemplatePatch' into 'master'
RM-7003: [Upgrade] Generate Hold Report fails for a hold if has active content

Closes RM-7003

See merge request records-management/records-management!1276
2019-10-17 08:06:15 +01:00
Ramona Popa
5bae9d32a1 RM-7003: [Upgrade] Generate Hold Report fails for a hold if has active content
- added new the patch to update the hold report template
2019-10-17 08:06:15 +01:00
Rodica Sutu
f395f7b035 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7006_UpdateToACS611 2019-10-17 09:30:54 +03:00
Ross Gale
1e236e085f Removing unused imports from RMv32HoldChildAssocPatchUnitTest.java 2019-10-16 08:48:01 +01:00
Ross Gale
94bb04d7f8 Removing unused import from RMv32HoldChildAssocPatch.java 2019-10-16 08:46:16 +01:00
gbroadbent
bcac8974a4 BRAZILIAN PORTUGUESE: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-16 00:55:43 +01:00
Ross Gale
25bb9c83f7 Merge branch 'feature/RM-6993_CreateNewAssoc' into 'master'
Resolve RM-6993 "Feature/ createnewassoc"

Closes RM-6993 and RM-6995

See merge request records-management/records-management!1265
2019-10-15 15:50:57 +01:00
gbroadbent
750e69f849 BRAZILIAN PORTUGUESE: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 14:50:27 +01:00
Ross Gale
4b7b25893c Merge branch 'feature/RM-6995_CreateNewAssocPatch' into 'feature/RM-6993_CreateNewAssoc'
Resolve RM-6995 "Feature/ createnewassocpatch"

See merge request records-management/records-management!1271
2019-10-15 14:17:39 +01:00
Ross Gale
1c30a04c5b Resolve RM-6995 "Feature/ createnewassocpatch" 2019-10-15 14:17:39 +01:00
gbroadbent
6fd5e0197d SIMPLIFIED CHINESE: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:41:16 +01:00
gbroadbent
cb068b9fd0 RUSSIAN: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:40:26 +01:00
gbroadbent
0e8255d59c DUTCH: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:39:44 +01:00
gbroadbent
e312e1128f NORWEGIAN Bokmal: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:39:08 +01:00
gbroadbent
d37ac2f955 JAPANESE: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:38:32 +01:00
gbroadbent
d5b41e179f ITALIAN: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:37:43 +01:00
gbroadbent
d25733fdb6 FRENCH: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:36:27 +01:00
gbroadbent
ea9f43d3d6 GERMAN: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:35:34 +01:00
gbroadbent
667859aa42 SPANISH: Updated files for AGS 3.2 based on EN-RM-rev 10th Oct 2019 - fix for LOC-169 2019-10-15 13:34:31 +01:00
cagache
d90b74c80c Revert "Try to use docker build arguments"
This reverts commit 873ac9ef
2019-10-15 09:11:32 +03:00
cagache
873ac9ef1a Try to use docker build arguments 2019-10-15 08:17:48 +03:00
cagache
c4685a23d1 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7006_UpdateToACS611 2019-10-14 12:44:57 +03:00
Rodica Sutu
b1a9d59aa9 revert the changes from community as there is no corresponding community release for ACS 6.1.1 2019-10-11 12:53:00 +03:00
Claudia Agache
bfb19ee91e Merge branch 'feature/RM-6982_UpdateStringsInTests' into 'master'
RM-6982 Update Strings in tests

Closes RM-6982

See merge request records-management/records-management!1274
2019-10-11 09:03:48 +01:00
Tom Page
c820d3d2ca Merge release/V3.1 into master. 2019-10-11 08:30:45 +01:00
Tom Page
6f08a237b2 Merge release/V3.0 into release/V3.1. 2019-10-11 08:26:31 +01:00
Tom Page
3407c560ba Record-only merge to sync with published release/V3.0. 2019-10-11 08:23:54 +01:00
cagache
1dff0dbecd Replace exception messages in tests 2019-10-11 10:16:23 +03:00
Tom Page
793603f6b1 Merge release/V2.7 into release/V3.0. 2019-10-11 08:14:56 +01:00
cagache
9d606baf3c Replace exception messages in tests 2019-10-11 09:32:58 +03:00
cagache
0db6218624 Record only merge. 2019-10-11 09:10:35 +03:00
cagache
5290538d9d Record only merge. 2019-10-11 09:04:43 +03:00
Ross Gale
9a9965fdd0 Merge branch 'feature/RM-6982_StringUpdate' into 'master'
Resolve RM-6982 "Feature/ stringupdate"

Closes RM-6982

See merge request records-management/records-management!1273
2019-10-10 16:54:02 +01:00
Ross Gale
ae99c53468 RM-6982 updating hold properties strings 2019-10-10 16:22:41 +01:00
Ross Gale
4017f9f101 RM-6982 updating hold properties strings 2019-10-10 16:21:31 +01:00
Rodica Sutu
e2848f3aef library updates to ones from ACS 6.1.1 2019-10-10 17:26:11 +03:00
cagache
9d9bdff348 Record only merge. 2019-10-10 17:19:38 +03:00
cagache
02eec901b3 Record only merge. 2019-10-10 17:17:44 +03:00
cagache
3cd9aaeef5 Record only merge. 2019-10-10 17:15:46 +03:00
alfresco-build
42a32d4422 [maven-release-plugin] prepare for next development iteration 2019-10-10 13:19:15 +01:00
alfresco-build
5dc0d39287 [maven-release-plugin] prepare release V2.6.0.1 ags-2.6.0.1 2019-10-10 13:19:11 +01:00
Tom Page
3d5d01efb8 Record-only merge release/V2.7.2.x into release/V2.7. 2019-10-10 08:52:45 +01:00
alfresco-build
d7d68b10a6 [maven-release-plugin] prepare for next development iteration 2019-10-09 15:23:26 +01:00
alfresco-build
7fe911dcdb [maven-release-plugin] prepare release V2.7.2.2 ags-2.7.2.2 2019-10-09 15:23:22 +01:00
Ramona Popa
88ffa3ccc0 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
5370b92eb8 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
1f81c867aa 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