Commit Graph

5816 Commits

Author SHA1 Message Date
Rodica Sutu
2b7caed6aa Merge branch 'feature/RM-7012_ActionNameInListOfValuesForAudit' into 'master'
RM-7012

See merge request records-management/records-management!1280
2019-10-28 06:57:46 +00:00
Ramona Popa
2d858fd6ec RM-7035: Add policies for holds
- fix other tests
2019-10-25 16:20:47 +03:00
Rodica Sutu
6e561ed55a Merge branch 'feature/RM-7043_UpgradeApacheCommonsCompress' into 'master'
RM-7043

See merge request records-management/records-management!1281
2019-10-25 14:02:08 +01:00
Ramona Popa
4346fe00f4 RM-7035: Add policies for holds
- some minor formating
   - fix unit test
2019-10-25 15:48:10 +03:00
Ramona Popa
40b2b5b201 RM-7035: Add policies for holds
- implementation for policies
   - integration tests
2019-10-25 12:41:09 +03:00
Rodica Sutu
61b1375cdd Update the version for org.apache.commons:commons-compress to 1.19 (fix the security vulnerability alert from github) 2019-10-25 12:21:28 +03:00
Rodica Sutu
0893ae3f48 move the actions property file in module-context.xml as the audit events that take the action name are loaded at bootstrap 2019-10-25 11:35:02 +03:00
Ramona Popa
deda5271f6 RM-6860: Add hold service policies
- Added HoldServicePolicies interface
2019-10-24 11:00:29 +03:00
Rodica Sutu
86d6ba5ce7 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
2019-10-24 07:02:16 +01:00
Rodica Sutu
ebe1d023a1 Merge branch 'feature/RM-7006_UpdateToACS611' of https://git.alfresco.com/records-management/records-management into feature/RM-7006_UpdateToACS611 2019-10-23 10:09:14 +03:00
Rodica Sutu
3302301264 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7006_UpdateToACS611 2019-10-23 10:03:44 +03:00
cagache
fe5563b322 Record only merge of version change. 2019-10-22 12:51:18 +03: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
bc52688e69 [maven-release-plugin] prepare for next development iteration 2019-10-22 09:18:49 +01: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
Tom Page
80a702d0c9 Add support for jRebel hot reloading.
The java files in the repository can be hot reloaded when started from the share docker-file.
2019-10-18 16:15:47 +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
Rodica Sutu
6a0dcab8a3 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
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
gbroadbent
facb4e7ef7 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
4e9da6fbd0 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
0adf5824d4 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
c4fd97ff64 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
84380dde3f Resolve RM-6995 "Feature/ createnewassocpatch" 2019-10-15 14:17:39 +01:00
gbroadbent
f7a533952b 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
20869ed3de 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
7374a88797 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
f9cb9044d3 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
ae53445da0 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
0ff7e0037e 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
1e2f68d396 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
d9787c6892 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
20bdcceebd 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
c95ea4c219 Revert "Try to use docker build arguments"
This reverts commit 855212c7
2019-10-15 09:11:32 +03:00
cagache
855212c761 Try to use docker build arguments 2019-10-15 08:17:48 +03:00
cagache
c010e05e94 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7006_UpdateToACS611 2019-10-14 12:44:57 +03:00
Rodica Sutu
2bd1429c0f 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
82c64b748a 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
71fba6e66c Merge release/V3.1 into master. 2019-10-11 08:30:45 +01:00
Tom Page
41faf7d114 Merge release/V3.0 into release/V3.1. 2019-10-11 08:26:31 +01:00
Tom Page
f542e7baf5 Record-only merge to sync with published release/V3.0. 2019-10-11 08:23:54 +01:00