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

806 Commits

Author SHA1 Message Date
Tom Page
eeb23b51e1 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
ddae9fbd64 RM-7119 Throw explicit exception rather than logging message. 
Also address other code review comments.
 2020-02-27 07:55:40 +00:00
Tom Page
ff9be3024b RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Roxana Lucanu
8d31a0b57b RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
59e0979070 RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
b2011a8a52 Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'" 
This reverts merge request !1353
 2020-01-27 08:43:09 +00:00
Roxana Lucanu
db4dc1f016 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Tom Page
4b01395ae6 RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
25d400d3b5 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5' 
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
 2020-01-14 19:02:48 +02:00
Roxana Lucanu
53c2fa77a7 Revert "Merge branch 'merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.6'" 
This reverts merge request !1349
 2020-01-14 16:40:18 +00:00
Roxana Lucanu
80b8dd2bff Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6' 
Resolve MNT-20822 "Merge 2.6/ hasmore"

See merge request records-management/records-management!1350
 2020-01-14 14:13:33 +00:00
Roxana Lucanu
1954b9bece Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
Roxana Lucanu
f85f9f3a05 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Roxana Lucanu
ef6bac0b56 RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
89d0de6b50 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
Roxana Lucanu
c40b4217cf RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
b9fc4e101f RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
b6b50306b3 RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
8228fe5939 MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Ross Gale
b1f3d11cf5 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
155952d28f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
1065c1c064 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
03eee1b8e3 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8 Merge branch 'release/V2.7' into release/V3.0 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
 2020-01-02 16:15:49 +00:00
Sara Aspery
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 Merge branch 'release/V2.6' into release/V2.7 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
 2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
45e39aa4bd Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
6035370684 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
8d5ff56f8f Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Ross Gale
3505e8dfd6 fix conflicts 2019-11-29 10:59:47 +00:00
Roxana Lucanu
a7f2dec355 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Ross Gale
3937379587 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
ffaf55c7d3 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
Ross Gale
df6d92d031 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 14:25:27 +00:00
Tom Page
5f87a5cd92 Update license headers. 2019-10-02 14:58:48 +01:00
cagache
995a771b51 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
fa48983bb6 apply code style 2019-09-02 13:33:37 +03:00
Roy Wetherall
a48cb2755c Deal with review comments 2019-08-30 11:28:44 +10:00
Roy Wetherall
8e26f5aad5 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
1c539f9f05 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
211ebba2f2 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Sara Aspery
d79caf2466 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
18bd7d7fac MNT-20740 New db query 2019-08-22 11:19:34 +01:00
Sara Aspery
7c4d8e91ab MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01: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
Ross Gale
807032334d MNT-20741 adding code to check for subtypes 2019-07-11 15:41:14 +01: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