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,622 Commits 324 Branches 2,170 Tags
f7e69629bb30f15ca8b17d598775e1ee2faaedcc
Commit Graph

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Rodica Sutu
8ab3078bba fix sonar final warning 2019-07-05 12:50:19 +03:00
cagache
5a30bb57d1 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 
(cherry picked from commit e8725860eb)

# 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
ab6a5dbe02 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
0b765199fe Merge IE changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 17:11:45 +03:00
Rodica Sutu
c6b87beb6a 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
f0cac1040c 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
9cea9be8a2 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
a976789861 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 
(cherry picked from commit a54a80f6a6)

# 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
4de260d588 Back-port fix from MNT-19967 2019-07-04 15:29:51 +03:00
Rodica Sutu
53b843d958 review updates 2019-07-04 13:18:16 +03:00
cagache
91534ac7df code review comments 2019-07-04 11:28:35 +03:00
cagache
ff8816a38e Update branch with latest release/V3.0 changes 2019-07-04 10:01:06 +03:00
cagache
cd76665548 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
b1ac8da7d9 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
7a03c64ffd Merge changes from release/V3.0 branch to release/V3.1 branch 2019-07-04 09:40:11 +03:00
Rodica Sutu
65fd23c294 code review changes 2019-07-03 18:23:45 +03:00
cagache
7a370248a2 Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-03 17:30:10 +03:00
cagache
d27d927f51 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
96291db607 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
179205ec61 code review comments 2019-07-02 17:34:51 +03:00
Ross Gale
95220d099b RM-6564 adding documentation 2019-07-02 12:21:00 +01:00
cagache
2071139e6e Sonar critical bug: inefficient use of keySet iterator instead of entrySet iterator 2019-07-02 12:06:13 +03:00