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

5190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ross Gale
b799e5600b RM-6836 formatting change 
(cherry picked from commit 05c70ede63)
 2019-06-21 16:05:24 +03:00
Ross Gale
b65400746e RM-6836 adding review comments 
(cherry picked from commit 07d4c451ca)
 2019-06-21 16:05:09 +03:00
Ross Gale
02093eac33 RM-6836 adding the severe and serious sonar fixes 
(cherry picked from commit 9f2336d487)
 2019-06-21 16:04:47 +03:00
Ross Gale
b44d8e3be5 Removing sonar warnings 
(cherry picked from commit 86f66dbd85)
 2019-06-21 16:04:28 +03:00
Ross Gale
16f96e6e91 Removing severe sonar warnings 
(cherry picked from commit 665c579560)
 2019-06-21 16:03:43 +03:00
Ross Gale
46212a2aae RM-6836 updating variable beanname 
(cherry picked from commit c99fa9b421)
 2019-06-21 16:03:22 +03:00
alfresco-build
ff84a1ae37 [maven-release-plugin] prepare for next development iteration 2019-04-30 11:32:13 +01:00
alfresco-build
f07dd878bf [maven-release-plugin] prepare release V3.0.1 ags-3.0.1 2019-04-30 11:32:08 +01:00
Rodica Sutu
c3b4b0cd77 Merge branch 'feature-3.0/RM-6823_UpgradeToACS601' into 'release/V3.0' 
RM-6823 "Feature 3.0/ upgradetoacs601"

See merge request records-management/records-management!1160
 2019-04-19 15:13:59 +01:00
Rodica Sutu
11d48c0c36 Update to ACS 6.0.1.2 2019-04-19 15:13:59 +01:00
Claudia Agache
e311f8c0ca Merge branch 'feature-3.0/Fix_ClassNotFoundException_logs' into 'release/V3.0' 
RM-6822 Renamed test classes to end with Test or Tests to get rid of java.lang.ClassNotFoundException

See merge request records-management/records-management!1152
 2019-04-12 09:33:17 +01:00
cagache
6a54f42ea6 Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException 2019-04-10 17:47:48 +03:00
cagache
ab27a2581c Record only merge of version change. 2019-04-10 09:57:12 +03:00
cagache
b4c29ae16d Record only merge of version change. 2019-04-10 09:54:17 +03:00
Rodica Sutu
a4ec375afd Merge branch 'merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies' into 'release/V3.0' 
Resolve RM-6787 "Merge 3.0/ versionwhenclassifyfilewithcopies"

See merge request records-management/records-management!1149
 2019-04-09 16:24:43 +01:00
Rodica Sutu
d042925488 Update version to 2.7.2.1-SNAPSHOT 2019-04-09 11:47:20 +03:00
alfresco-build
765c163d02 [maven-release-plugin] prepare for next development iteration 2019-04-09 09:04:42 +01:00
alfresco-build
237cd19f12 [maven-release-plugin] prepare release V2.7.2 ags-2.7.2 2019-04-09 09:04:38 +01:00
Rodica Sutu
bb93c0ad4e Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies 
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
 2019-04-09 10:51:44 +03:00
Ross Gale
c2a216f009 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' into 'release/V2.7' 
Version change fix

See merge request records-management/records-management!1147
 2019-04-08 17:34:59 +01:00
Ross Gale
61802a8fb9 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' of git.alfresco.com:records-management/records-management into feature-2.7/RM-6787_ReduceBinDuplication_V3 2019-04-05 15:52:03 +01:00
Ross Gale
c551042eca RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
cagache
f4ecf2a125 Merge remote-tracking branch 'remotes/origin/release/V2.7' into 'merge-3.0/MergeTestChangesFromV2.7' 2019-04-05 15:07:50 +03:00
cagache
c4cf0ff8cb Revert "Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no"" 
This reverts commit eb9071fb73.
 2019-04-05 13:08:38 +03:00
cagache
eb9071fb73 Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no" 
This reverts commit b5d1ae792eae2bd5adf4b1211011ace1046d40b7, reversing
changes made to d5dfbe7194c9e421b52e08032d192c089191e384.
 2019-04-05 12:04:27 +03:00
Ross Gale
9baac01d03 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Ross Gale
ed8f24865c RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
5b3666f6e1 Merge branch 'feature-3.0.1/RM-6788_ArchiveClassifyDeclareFix' into 'release/V3.0' 
RM-6788 adding change to 3.0.1 branch

See merge request records-management/records-management!1133
 2019-03-18 13:07:58 +00:00
cagache
7bce79e772 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
Claudia Agache
2a0c0dd82c Merge branch 'feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no' into 'release/V2.7' 
RM-6786 Declare file as record when file already has version declared as record

See merge request records-management/records-management!1134
 2019-03-15 07:06:55 +00:00
Roxana Lucanu
2193a612bf Merge branch 'feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into 'release/V2.7' 
RM-6786 Added check for records

See merge request records-management/records-management!1135
 2019-03-15 07:03:50 +00:00
cagache
a1e0391042 Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 16:34:48 +02:00
rlucanu
2351eafd65 RM-6786 another fix 2019-03-14 16:24:50 +02:00
cagache
644b89b7f1 Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 09:55:10 +02:00
rlucanu
1b9d4306c8 RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
cagache
497d16d806 code review comments 2019-03-14 09:19:23 +02:00
cagache
0a29bf0201 added cleanup method 2019-03-13 15:54:15 +02:00
Ross Gale
8bf3cdf913 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
cagache
cd1a861f4e RM-6786 Create test to check that a file that has a record version can be declared as record 2019-03-13 12:23:25 +02:00
Rodica Sutu
8fd19d1da2 Merge branch 'feature-3.0/RM_UpdateJacksonLibrary' into 'release/V3.0' 
Feature 3.0/ RM-6785 update jackson library

See merge request records-management/records-management!1131
 2019-03-12 09:02:47 +00:00
Rodica Sutu
8a72644dec Update Jackson version library 2019-03-07 13:19:28 +02:00
cagache
e1f8197fb7 Record only merge of version change. 2019-02-26 09:19:16 +02:00
Rodica Sutu
08a13d4847 Merge branch 'merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V3.0' 
Merge 3.0/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1126
 2019-02-25 21:29:18 +00:00
cagache
918719be0c Record only merge of version change. 2019-02-25 16:29:44 +02:00
cagache
b62801534d Record only merge of version change. 2019-02-25 16:19:49 +02:00
cagache
c241b5899a Update version to 2.6.2.1-SNAPSHOT 2019-02-25 16:07:47 +02:00
Rodica Sutu
c96f9ae280 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
2f943394fd Merge branch 'merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V2.7' 
Merge 2.7/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1125
 2019-02-25 13:59:39 +00:00
alfresco-build
9fdc1588cf [maven-release-plugin] prepare for next development iteration 2019-02-25 13:44:27 +00:00
alfresco-build
201807cff5 [maven-release-plugin] prepare release V2.6.2 ags-2.6.2 2019-02-25 13:44:23 +00:00