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

762 Commits

Author SHA1 Message Date
Ross Gale
d0487f17d7 fix conflicts 2019-11-29 10:59:47 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
5d3efcc4c4 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
cagache
045f19f8d9 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix 
# Conflicts:
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
 2019-09-03 10:10:18 +03:00
cagache
1f6bb8c277 apply code style 2019-09-02 13:33:37 +03:00
Roy Wetherall
02411e3e59 Deal with review comments 2019-08-30 11:28:44 +10:00
Roy Wetherall
88e538ddbb Addition tests for records, fixed up a couple of issues in the query method as a result. 2019-08-29 21:35:00 +10:00
Roy Wetherall
e282c0584e Fix issue with inaccurate results returning from content URL query 
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
 2019-08-29 12:28:04 +10:00
Roy Wetherall
4518cd8615 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Sara Aspery
30f770a504 Merge branch 'feature-2.7/MNT-20740_BinDuplicationHotFix' into hotfix-2.7/MNT-20740_BinDuplicationHotFix 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
 2019-08-22 12:29:45 +01:00
Sara Aspery
ecbaa3b40c MNT-20740 New db query 2019-08-22 11:19:34 +01:00
Sara Aspery
640ddc95f9 MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00
Ross Gale
412a313702 Removing severe sonar warnings 
(cherry picked from commit 343602e94d)

(cherry picked from commit b66cce35e3)
 2019-07-18 11:15:01 +03:00
cagache
bd9cb64c70 Merge MNT-20741 fix from release/V2.7 branch to release/V3.0 branch 2019-07-18 09:17:18 +03:00
Ross Gale
aa83ccaab8 MNT-20741 adding code to check for subtypes 2019-07-11 15:41:14 +01:00
Ross Gale
e2e0e5631a MNT-20740 initial commit for delete protection for copied records 2019-07-10 10:53:27 +01: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
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
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
cagache
d645c19e37 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
3dc65aaed5 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
cagache
e27ea5218c Merge changes from V3.0 branch 2019-07-01 12:12:32 +03:00
Ross Gale
638b90f061 Merge branch 'release/V3.0' into feature-3.0/RM-6564_IE_DevelopmentTask 2019-06-26 10:51:42 +01:00
Ross Gale
d448337075 RM-6831 updating search value 
(cherry picked from commit eb36d67161)
 2019-06-21 16:21:49 +03:00
Ross Gale
f739fe5d3c RM-6831 adding sonar fix 
(cherry picked from commit 8a83b5f924)
 2019-06-21 16:21:30 +03:00
cagache
7b73748b2b fix Sonar: Empty statements should be removed 
(cherry picked from commit 8076adfe2c)
 2019-06-21 16:20:35 +03:00
cagache
da91ad3f2d Fix sonar Performance - Boxed value is unboxed and then immediately reboxed 
(cherry picked from commit 825fb10d17)
 2019-06-21 16:16:01 +03:00
Ross Gale
e5102544a3 RM-6836 remove unused imports 
(cherry picked from commit 5591e7fae4)
 2019-06-21 16:06:43 +03:00
Ross Gale
dfce7f3484 RM-6836 formatting change 
(cherry picked from commit 768494b932)
 2019-06-21 16:06:18 +03:00
Ross Gale
f9b3efd3b5 RM-6836 formatting change 
(cherry picked from commit e5b76e91cd)
 2019-06-21 16:05:55 +03:00
Ross Gale
0cee7a7c9c RM-6836 formatting change 
(cherry picked from commit 69b5a73371)
 2019-06-21 16:05:24 +03:00
Ross Gale
a75d4ab31d RM-6836 adding review comments 
(cherry picked from commit da77c03cdb)
 2019-06-21 16:05:09 +03:00
Ross Gale
abaf8af097 RM-6836 adding the severe and serious sonar fixes 
(cherry picked from commit 747280acdf)
 2019-06-21 16:04:47 +03:00
Ross Gale
b75785d6c6 Removing sonar warnings 
(cherry picked from commit 507abdecad)
 2019-06-21 16:04:28 +03:00
Ross Gale
b66cce35e3 Removing severe sonar warnings 
(cherry picked from commit 343602e94d)
 2019-06-21 16:03:43 +03:00
Ross Gale
a83fb57f68 RM-6836 updating variable beanname 
(cherry picked from commit 792e5912d5)
 2019-06-21 16:03:22 +03:00
Rodica Sutu
cbbc092209 Merge branch 'feature/RM-6835_FixJavaDocRMCommunity' into 'master' 
Fix java docs for rm community repo:

Closes RM-6835

See merge request records-management/records-management!1163
 2019-06-20 15:14:31 +01:00
Tuna Aksoy
533f36ea66 RM-6141: RM_support_for_the_Insight_Engine 
(cherry picked from commit 8858f8fd188e70d1175cf3134cda2af80cf967fc)
 2019-06-18 17:55:55 +03:00
Rodica Sutu
4934fa5634 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
0c2833a5a2 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
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
6cf5344989 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
73c8c23766 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
rlucanu
86ae0f726a RM-6786 another fix 2019-03-14 16:24:50 +02:00
rlucanu
2f15cc786e RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
Ross Gale
8d97d12f88 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00