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

1117 Commits

Author SHA1 Message Date
Roxana Lucanu
7def9837ad RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Tom Page
2ce88dcc12 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00:00
Tom Page
44aa3b4f82 Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
56f1549d7d Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
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
Rodica Sutu
da92ed7f3b Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/MNT-21292_DownloadRecords 2020-02-26 14:59:41 +02:00
Rodica Sutu
e30bc9510c Merge remote-tracking branch 'remotes/origin/release/V3.2.0.x' into merge-3.2/MNT-21292_DownloadViaPost 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/search/impl/solr/ExtendedSolrQueryHTTPClient.java
 2020-02-24 15:26:38 +02:00
Rodica Sutu
098c80bd03 cherry pick 
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/DownloadAsZipRecordTest.java
 2020-02-18 16:32:43 +02:00
Rodica Sutu
49f504ba93 update the assoc policy for the case when the create assoc source node is not a file plan component node 2020-02-18 16:31:20 +02:00
Sara Aspery
2790244142 Update license headers 2020-02-18 11:10:36 +02:00
Sara Aspery
2d0913df35 Merge branch 'release/V3.1' into release/V3.2 2020-02-18 11:07:45 +02:00
Ramona Popa
741373a832 RM-7111: AGS 3.3 can't be installed on ACS 6.1 
- added alfresco.min.version to 6.1
 2020-02-05 12:28:31 +00:00
Roxana Lucanu
ad026aec83 Merge branch 'release/V3.2' into merge-3.3/RM-7065_RetentionScheduleInheritance 2020-01-29 09:36:53 +02:00
Roxana Lucanu
f78453a730 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
09769e3cc2 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02: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
de34a72e33 Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'" 
This reverts merge request !1350
 2020-01-27 08:14:33 +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
Christopher Shields
d9c3d3c219 RM-7101: [Upgrade] Delete hold audit events are not properly migrated 2020-01-13 00:00:34 +00:00
Ramona Popa
8027c10b4b RM-7098: [Upgrade] Add to Hold and Remove from hold audit events are not properly migrated 2020-01-10 09:23:06 +00: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
d9e1c21cd6 Update license headers 2020-01-03 10:53:19 +00:00
Sara Aspery
187db478a5 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
e1da6ab294 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
f7e69629bb Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00: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
Sara Aspery
ff5f8f8d68 RM-7062 fix for failing tests 2019-12-20 02:20:13 +00:00