Commit Graph

6147 Commits

Author SHA1 Message Date
cagache
2fd1f661e2 code review comments 2019-08-02 17:31:02 +03:00
cagache
c33a174b1a Removed printed exception 2019-08-02 15:38:54 +03:00
cagache
30d05f4f7a Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6872_AddActiveContentToHold 2019-08-02 15:37:21 +03:00
cagache
862e69da17 get default file plan only if node is not a file plan component 2019-08-02 09:42:09 +03:00
cagache
5348b963c3 code review comments 2019-08-01 16:02:55 +03:00
Tom Page
a97bf04cff Merge release/V2.6 into release/V2.7. 2019-08-01 13:39:25 +01:00
Tom Page
8c008a5b6d Merge branch 'feature-2.6/RemoveExceptionsFromGSCoreAPI' into 'release/V2.6'
Remove unthrown checked exceptions.

See merge request records-management/records-management!1211
2019-08-01 13:38:45 +01:00
Tom Page
1df5a307c4 Revert "Use AlfrescoRuntimeException."
This reverts commit b2c0afd8d5.
2019-08-01 13:33:26 +01:00
Tom Page
b2c0afd8d5 Use AlfrescoRuntimeException. 2019-08-01 13:23:43 +01:00
Tom Page
9a36a9e8d6 Remove unthrown checked exceptions.
Update the javadoc to refer to RuntimeExceptions instead.  Also conversion from
IOException to RuntimeException in UnfiledContainerAPI and UnfiledRecordFolderAPI
to add consistency with RecordFolderAPI.
2019-08-01 09:51:31 +01:00
Sara Aspery
7c4d8e91ab MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00
cagache
bb970e33f5 Add ASPECT_HELD_CHILDREN on active content parent 2019-07-29 15:35:35 +03:00
cagache
820d1b2c0d Added IT and unit tests for add file to hold 2019-07-25 17:51:17 +03:00
cagache
9c13bf3ced Add IT to check that active content can be added to a hold by admin user 2019-07-25 11:07:36 +03:00
cagache
2aeb78b57c Add ASPECT_HELD_CHILDREN on active content parent 2019-07-24 17:30:15 +03:00
cagache
f61992f047 Allow active content to be added to a hold 2019-07-23 15:45:23 +03:00
cagache
512297c6a4 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/MNT-20741_AddingSubtypeLogic 2019-07-19 12:41:43 +03:00
cagache
9c344bd97b Merge MNT-20741 fix from release/V3.0 branch to release/V3.1 branch 2019-07-19 08:50:05 +03:00
Ross Gale
557ce8b432 Removing severe sonar warnings
(cherry picked from commit 665c579560)

(cherry picked from commit 16f96e6e91)
2019-07-18 11:15:01 +03:00
cagache
894dd69c74 Merge MNT-20741 fix from release/V2.7 branch to release/V3.0 branch 2019-07-18 09:17:18 +03:00
cagache
ecf2f9bc21 Merge remote-tracking branch 'remotes/origin/release/V2.7.2.x' into merge-2.7/MNT-20741_AddingSubtypeLogic 2019-07-17 09:50:40 +03:00
cagache
5152c1c0ce Record only merge of version change. 2019-07-15 16:23:02 +03:00
cagache
35e9e20871 Record only merge of version change. 2019-07-15 16:21:20 +03:00
cagache
ff9a5f239b Record only merge of version change. 2019-07-15 16:19:41 +03:00
cagache
a6e413c52f Update version to 3.0.2.1-SNAPSHOT 2019-07-15 15:36:52 +03:00
alfresco-build
aed94d26cf [maven-release-plugin] prepare for next development iteration 2019-07-15 12:22:08 +01:00
alfresco-build
0788a065c6 [maven-release-plugin] prepare release V3.0.2 ags-3.0.2 2019-07-15 12:22:04 +01:00
Ross Gale
1e8dcd5e24 Merge branch 'feature-2.7/MNT-20741_AddingSubtypeLogic' into 'release/V2.7.2.x'
MNT-20741 adding code to check for subtypes

See merge request records-management/records-management!1207
2019-07-12 16:37:00 +01:00
cagache
5551b6f89f Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6577_MergeIERMTests 2019-07-12 15:29:30 +03:00
cagache
9dc6a7a0ac Record only merge of version change. 2019-07-12 15:25:00 +03:00
Ross Gale
807032334d MNT-20741 adding code to check for subtypes 2019-07-11 15:41:14 +01:00
rlucanu
7a048cdf7e Record only merge of version change. 2019-07-10 16:21:40 +03:00
rlucanu
7753cfc554 Record only merge of version change. 2019-07-10 16:20:24 +03:00
rlucanu
d64b6da5c2 Record only merge of version change. 2019-07-10 16:18:31 +03:00
Ross Gale
075794981b MNT-20740 initial commit for delete protection for copied records 2019-07-10 10:53:27 +01:00
cagache
82046a2f0f Back-port fix from MNT-19967
(cherry picked from commit 4de260d588)
2019-07-10 07:52:28 +03:00
rlucanu
8438e17a8d Reset code back to b03837b751. 2019-07-10 07:49:40 +03:00
rlucanu
88a298e945 Record only merge of version change. 2019-07-09 14:40:23 +03:00
rlucanu
a453a46074 Record only merge of version change. 2019-07-09 14:37:03 +03:00
rlucanu
b03bcf3008 Record only merge of version change. 2019-07-09 14:23:25 +03:00
rlucanu
f669cfdaea Merge remote-tracking branch 'origin/release/V2.5' into release/V2.5
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
2019-07-09 13:50:04 +03:00
rlucanu
32c467beec Merge remote-tracking branch 'remotes/origin/release/V2.5.3.x' into release/V2.5 2019-07-09 13:49:07 +03:00
rlucanu
a606a343b3 Revert "Record only merge of version change."
This reverts commit 6e197f2a2d, reversing
changes made to 211244279a.
2019-07-09 12:12:28 +03:00
rlucanu
6e197f2a2d Record only merge of version change. 2019-07-09 11:09:28 +03:00
Rodica Sutu
8bedb94a5e Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6823_MergeIERMTests
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/UpdateRecordsTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/ClassifyCompleteRecordsTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordFoldersTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordsTests.java
2019-07-09 08:48:13 +03:00
alfresco-build
211244279a [maven-release-plugin] prepare for next development iteration 2019-07-08 16:39:21 +01:00
alfresco-build
a37547b22a [maven-release-plugin] prepare release V2.5.3.2 ags-2.5.3.2 2019-07-08 16:39:17 +01:00
Rodica Sutu
c26fa610df Merge branch 'feature-3-0/RM-6577_AutomatedRestApiTests' into 'release/V3.0'
Resolve RM-6577 "Feature 3 0/ automatedrestapitests"

See merge request records-management/records-management!1199
2019-07-08 06:54:36 +01:00
cagache
0d0c1c4048 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6564_InsightEngine 2019-07-05 16:59:55 +03:00
Roxana Lucanu
b1bb756913 Merge branch 'hotfix-2.5/MNT-20700_backportFix' into 'release/V2.5.3.x'
Back-port fix from MNT-19967

See merge request records-management/records-management!1204
2019-07-05 12:54:42 +01:00