Commit Graph

5784 Commits

Author SHA1 Message Date
Ross Gale
f42cd05af3 Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/mergeUp 2019-12-02 08:08:06 +00:00
Ross Gale
05e3238d1d Merge branch 'merge-3.1/mergeUp' into 'release/V3.1'
Merge 3.1/merge up

See merge request records-management/records-management!1320
2019-12-02 07:58:27 +00:00
Ross Gale
f5ddb592a0 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
4f65d24c02 Merge branch 'merge-3.0/mergeUp' into 'release/V3.0'
Merge 3.0/merge up

See merge request records-management/records-management!1319
2019-11-29 15:52:19 +00:00
Ross Gale
b53f460398 Record only merge of version change. 2019-11-29 12:12:07 +00:00
Ross Gale
d0487f17d7 fix conflicts 2019-11-29 10:59:47 +00:00
Ross Gale
f2f49c0b5e Record only merge of version change. 2019-11-26 11:36:53 +00:00
Ross Gale
c2bf8ff202 Merge branch 'merge-2.6/RM-7051_RecordOnly' into 'release/V2.6'
Resolve RM-7051 "Merge 2.6/ recordonly"

See merge request records-management/records-management!1310
2019-11-26 11:28:38 +00:00
Ross Gale
26804bfffe Record only merge of version change. 2019-11-26 11:22:35 +00:00
Ross Gale
3eedbf0836 Merge branch 'merge-2.5/RM-7051_RecordOnly' into 'release/V2.5'
Resolve RM-7051 "Merge 2.5/ recordonly"

See merge request records-management/records-management!1309
2019-11-26 11:16:17 +00:00
Ross Gale
1214128e2b Record only merge of version change. 2019-11-26 10:38:34 +00:00
Ross Gale
72c1e02832 Merge branch 'merge-2.7/RM-7051_MergeUp' into 'release/V2.7'
Resolve RM-7051 "Merge 2.7/ mergeup"

See merge request records-management/records-management!1308
2019-11-26 08:43:17 +00:00
Ross Gale
98f0487068 Update version.properties 2019-11-25 08:35:50 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
2b2c0b6d55 Merge branch 'merge-2.6/RM-7051_mergeUp' into 'release/V2.6'
Resolve RM-7051 "Merge 2.6/ mergeup"

See merge request records-management/records-management!1306
2019-11-22 18:15:24 +00:00
Ross Gale
5d3efcc4c4 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
Resolve RM-7051 "Hotfix 2.5/ disposition"

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

Adds web script to ensure all records have correct disposition instructions
2019-11-22 18:15:24 +00:00
Ross Gale
705a2daaf8 Merge branch 'merge-2.5/RM-7051_mergeUp' into 'release/V2.5'
Resolve RM-7051 "Merge 2.5/ mergeup"

See merge request records-management/records-management!1305
2019-11-22 14:25:27 +00:00
Ross Gale
92c8c2db21 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
Resolve RM-7051 "Hotfix 2.5/ disposition"

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

Adds web script to ensure all records have correct disposition instructions
2019-11-22 14:25:27 +00:00
Ross Gale
b6a7b93a52 Updating version number after release 2019-11-22 08:55:41 +00:00
alfresco-build
3c0a62fa81 [maven-release-plugin] prepare for next development iteration 2019-11-21 18:15:33 +00:00
alfresco-build
7fba698dd8 [maven-release-plugin] prepare release V2.5.3.3 2019-11-21 18:15:29 +00:00
Ross Gale
1001429288 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303
2019-11-21 14:32:24 +00:00
Ross Gale
8c597c28d3 RM-7051 merge 2019-11-21 11:08:39 +00:00
Ross Gale
fbf379d6f2 RM-7051 review comments 2019-11-21 11:04:35 +00:00
Roy Wetherall
42e6fbdb6a Prevent unwanted audit entries appearing when updating the records 2019-11-21 13:54:09 +11:00
Ross Gale
bbadc9799e RM-7051 simplyfing sql and adding check for links 2019-11-21 01:16:37 +00:00
Ross Gale
9bf4f1d9d9 RM-7051 updating messaging 2019-11-20 13:33:35 +00:00
Ross Gale
7d7946ea06 RM-7051 running the find records and update as system 2019-11-20 10:51:33 +00:00
Ross Gale
049837c7bb RM-7051 removing previous sql code 2019-11-19 16:20:39 +00:00
Ross Gale
f0f425e0cd RM-7051 removing patch code updating webscript 2019-11-19 13:38:40 +00:00
Roy Wetherall
07059aaaed Added web script to do record disposition schedule updates 2019-11-19 20:56:26 +11:00
Ross Gale
239f817286 RM-7051 updating patch code 2019-11-18 23:28:08 +00:00
Ross Gale
8caf6f8c8d RM-7051 updating messaging to report on batch completion 2019-11-18 14:05:17 +00:00
Ross Gale
9783335a3b RM-7051 adding code to deal with held records/folders 2019-11-18 10:55:39 +00:00
Ross Gale
efc5281183 RM-7051 adding batch code 2019-11-17 22:20:31 +00:00
Ross Gale
1e1209f987 RM-7051 adding batch code 2019-11-17 22:07:31 +00:00
Ross Gale
81033bbf12 Initial patch code to apply disposition fix to records 2019-11-13 15:52:29 +00:00
cagache
e42d56deb3 Record only merge of version change. 2019-10-22 12:50:20 +03:00
cagache
9bd5352772 Update version to 3.2.1-SNAPSHOT 2019-10-22 12:48:00 +03:00
cagache
cd15e99f77 Update version to 3.2.0.1-SNAPSHOT 2019-10-22 12:36:41 +03:00
alfresco-build
0af98c7064 [maven-release-plugin] prepare release V3.2.0 2019-10-22 09:18:45 +01:00
Ross Gale
7a9b4bcb78 Merge branch 'feature/RM-7014_CheckForRmSite' into 'master'
RM-7014 add code to check an rm site has been created before running the...

Closes RM-7014

See merge request records-management/records-management!1277
2019-10-19 11:26:07 +01:00
Ross Gale
0de5888170 Update RMv32HoldChildAssocPatch.java 2019-10-18 18:34:03 +01:00
Ross Gale
a50db046e8 Update rm-patch-v32-context.xml 2019-10-18 14:33:16 +01:00
Ross Gale
dd0d032895 RM-7014 code review comments 2019-10-18 14:26:48 +01:00
Ross Gale
83fcbd62e6 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
1283931f8e 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
5140c9208e 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
Ross Gale
3b0593d6c6 Removing unused imports from RMv32HoldChildAssocPatchUnitTest.java 2019-10-16 08:48:01 +01:00
Ross Gale
61ac4d9e41 Removing unused import from RMv32HoldChildAssocPatch.java 2019-10-16 08:46:16 +01:00