inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,816 Commits 324 Branches 2,170 Tags
b36b4e31cb15d4c2cbe7fd5d7c004f783553f6ca
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Gale
aa83ccaab8 MNT-20741 adding code to check for subtypes 2019-07-11 15:41:14 +01:00
rlucanu
298bbeed05 Record only merge of version change. 2019-07-10 16:21:40 +03:00
rlucanu
641c4a12da Record only merge of version change. 2019-07-10 16:20:24 +03:00
rlucanu
122aa3c09c Record only merge of version change. 2019-07-10 16:18:31 +03:00
Ross Gale
e2e0e5631a MNT-20740 initial commit for delete protection for copied records 2019-07-10 10:53:27 +01:00
cagache
8c3371b7f0 Back-port fix from MNT-19967 
(cherry picked from commit c412db13d5)
 2019-07-10 07:52:28 +03:00
rlucanu
88f2cecdd0 Reset code back to 7229ec2fbc. 2019-07-10 07:49:40 +03:00
rlucanu
78d81c03f2 Record only merge of version change. 2019-07-09 14:40:23 +03:00
rlucanu
7db8dc0f3e Record only merge of version change. 2019-07-09 14:37:03 +03:00
rlucanu
f31e39bded Record only merge of version change. 2019-07-09 14:23:25 +03:00
rlucanu
26e8659edb 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
4ecec3ddf9 Merge remote-tracking branch 'remotes/origin/release/V2.5.3.x' into release/V2.5 2019-07-09 13:49:07 +03:00
rlucanu
726dcc2e02 Revert "Record only merge of version change." 
This reverts commit eab3137a7c, reversing
changes made to 249675acc7.
 2019-07-09 12:12:28 +03:00
rlucanu
eab3137a7c Record only merge of version change. 2019-07-09 11:09:28 +03:00
Rodica Sutu
5af96a1523 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
249675acc7 [maven-release-plugin] prepare for next development iteration 2019-07-08 16:39:21 +01:00
alfresco-build
bf4ed09b09 [maven-release-plugin] prepare release V2.5.3.2 2019-07-08 16:39:17 +01:00
Rodica Sutu
0f17340a33 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
ca58b425cf Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6564_InsightEngine 2019-07-05 16:59:55 +03:00
Roxana Lucanu
3c4c4cf844 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
Rodica Sutu
5f4a5feb2a fix sonar final warning 2019-07-05 12:50:19 +03:00
cagache
2a9aca2ced transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 
(cherry picked from commit ebc860ea2a)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
 2019-07-05 10:32:10 +03:00
Rodica Sutu
ed02c79096 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-04 17:59:38 +03:00
cagache
3cec43a3e5 Merge IE changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 17:11:45 +03:00
Rodica Sutu
3a00b8429b Merge branch 'feature-3.0/RM-6565_UpdateDockerComposeWithIE' into 'release/V3.0' 
feature-3.0/RM-6565_UpdateDockerComposeWithIE

See merge request records-management/records-management!1197
 2019-07-04 14:50:17 +01:00
Rodica Sutu
5a475f8574 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3.0/RM-6565_UpdateDockerComposeWithIE 2019-07-04 16:18:25 +03:00
Claudia Agache
3b2dd34cec Merge branch 'feature-3.0/RM-6564_IE_DevelopmentTask' into 'release/V3.0' 
RM-6564 IE development task

See merge request records-management/records-management!1198
 2019-07-04 14:04:32 +01:00
cagache
1070562e07 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 
(cherry picked from commit 451eaaf679)

# 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-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/folder/RecordFolderClassificationTest.java
 2019-07-04 16:03:20 +03:00
cagache
c412db13d5 Back-port fix from MNT-19967 2019-07-04 15:29:51 +03:00
cagache
a876a3aee4 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6892_SonarFixes 2019-07-04 14:27:07 +03:00
Rodica Sutu
fce52415cb review updates 2019-07-04 13:18:16 +03:00
cagache
d3391adaac code review comments 2019-07-04 11:28:35 +03:00
cagache
ebc56c2954 Update branch with latest release/V3.0 changes 2019-07-04 10:01:06 +03:00
cagache
cc17d2f61e Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6892_SonarFixes 2019-07-04 09:47:50 +03:00
Claudia Agache
df539af3f9 Merge branch 'feature-3.0/RM-6892_SonarFixes' into 'release/V3.0' 
RM-6892 More sonar fixes

See merge request records-management/records-management!1203
 2019-07-04 07:44:12 +01:00
cagache
5857fb8826 Merge changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 09:40:11 +03:00
Rodica Sutu
9dddcdc110 code review changes 2019-07-03 18:23:45 +03:00
cagache
1523a0d8b9 Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-03 17:30:10 +03:00
cagache
0e181f5e41 Merge remote-tracking branch 'remotes/origin/release/V3.0' into feature-3.0/RM-6892_SonarFixes 2019-07-03 13:17:03 +03:00
Claudia Agache
55ad487b39 Merge branch 'feature-3.0/RM-6892_CherryPickSonarChangesFrom3.1' into 'release/V3.0' 
RM-6892 Cherry pick Sonar changes from AGS 3.1

See merge request records-management/records-management!1202
 2019-07-03 11:08:08 +01:00
cagache
882e363ec9 code review comments 2019-07-02 17:34:51 +03:00
Ross Gale
e4d2240915 RM-6564 adding documentation 2019-07-02 12:21:00 +01:00
cagache
6e2826f78c Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-02 12:06:13 +03:00
Rodica Sutu
0cb9b9704d Merge branch 'feature-3.0/RM-6565_UpdateDockerComposeWithIE' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-02 12:04:11 +03:00
Rodica Sutu
638363413b Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3.0/RM-6565_UpdateDockerComposeWithIE 2019-07-02 11:53:47 +03:00
Rodica Sutu
c689274db8 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-02 10:34:50 +03:00
Rodica Sutu
11a638c827 refactoring of the added rest api tests for SQL queries 
new tests added for sql queries for: record categories, record folders and records
 2019-07-02 10:29:21 +03:00
cagache
7782d7d448 Removed redundant local variables 2019-07-01 16:45:32 +03:00
cagache
1d86dd1aa2 Removed redundant conditional expression 2019-07-01 16:34:24 +03:00
cagache
5933f302ef Removed unnecessary null check before Boolean.parseBoolean 2019-07-01 16:28:48 +03:00