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
6,034 Commits 324 Branches 2,170 Tags
df8d4c23bb30aaf65add72e2d4d8fc33ab6fce7c
Commit Graph

6034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxana Lucanu
93f966a345 Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7' 
Resolve RM-7065 "Merge 2.7/ mnt 20822"

See merge request records-management/records-management!1353
 2020-01-20 18:16:54 +00:00
Roxana Lucanu
7b6db44df4 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
83e342ec06 Merge branch 'merge-2.6/RM-5733_portingFix' into 'release/V2.6' 
RM-5733 porting fix - cherry picked commit a2f515a6

See merge request records-management/records-management!1352
 2020-01-20 09:23:47 +00:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
7384b3f160 Merge branch 'merge-2.6/RM-7065' into 'release/V2.6' 
Merge branch 'merge-2.6/RM-7065' into 'release/V2.6'

See merge request records-management/records-management!1351
 2020-01-16 09:10:43 +00:00
Roxana Lucanu
490051aa21 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
286d18e24c 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
ffc768cbd5 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
e0fc20b01d Merge branch 'merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.6' 
Resolve RM-7065 "Merge 2.6/ retentionscheduleinheritancerecordlevel"

See merge request records-management/records-management!1349
 2020-01-14 14:10:36 +00:00
Roxana Lucanu
897a450001 Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
Roxana Lucanu
48bb960725 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Roxana Lucanu
3794ddbca3 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-10 09:26:14 +00:00
Roxana Lucanu
dbde8cefbb RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
a81409f821 Merge branch 'feature-2.6/MNT-20822-hasMore' into 'release/V2.6.0.x' 
MNT-20822 adding fix for has more

See merge request records-management/records-management!1343
 2020-01-09 15:27:32 +00:00
Ross Gale
1e38a577a0 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
Roxana Lucanu
f06f2df8b1 RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
862c19df35 RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
f30cca289d RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
75bc33640e MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Roxana Lucanu
313a0fe5bf Merge branch 'feature-2.5/UpdateLicenseHeader' into 'release/V2.5' 
update license header

See merge request records-management/records-management!1341
 2020-01-06 16:12:25 +00:00
Ross Gale
2dd9015ad8 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
99185e264f Merge branch 'feature-2.6/MNT-20822_UpdatingHeaders' into 'release/V2.6.0.x' 
Updating headers

See merge request records-management/records-management!1342
 2020-01-06 11:56:11 +00:00
Ross Gale
57e464b47f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
392ea281b1 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
f90586ce32 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
16b6678fd3 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
92f4843a24 Update license headers 2020-01-02 18:27:23 +00:00
Sara Aspery
fb014ba5dc Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
5865482fe6 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
304180f49e 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
5849812683 Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45 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
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
8a41dc1d68 Merge branch 'merge-3.2/RM-7060_FixSearchAspect' into 'release/V3.2' 
Resolve RM-7060 "Merge 3.2/ fixsearchaspect"

See merge request records-management/records-management!1332
 2019-12-10 12:17:15 +00:00
Roxana Lucanu
3c13cba8b5 Merge branch 'release/V3.1' into merge-3.2/RM-7060_FixSearchAspect 2019-12-10 09:09:56 +02:00
Roxana Lucanu
4be6336e45 Merge branch 'merge-3.1/RM-7060_FixSearchAspect' into 'release/V3.1' 
Resolve RM-7060 "Merge 3.1/ fixsearchaspect"

See merge request records-management/records-management!1331
 2019-12-10 07:04:45 +00:00
Roxana Lucanu
7d4dc81cb3 Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect 2019-12-09 14:39:06 +02:00
Roxana Lucanu
ba18adff55 Merge branch 'merge-3.0/RM-7060_FixSearchAspect' into 'release/V3.0' 
Resolve RM-7060 "Merge 3.0/ fixsearchaspect"

See merge request records-management/records-management!1330
 2019-12-09 12:36:21 +00:00
Roxana Lucanu
d67218cbb1 Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
85f125bdaf Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:44:26 +02:00
Roxana Lucanu
31eeaf187e Merge branch 'merge-2.7/RM-7060_FixSearchAspect' into 'release/V2.7' 
Resolve RM-7060 "Merge 2.7/ fixsearchaspect"

See merge request records-management/records-management!1329
 2019-12-09 08:24:51 +00:00
Ross Gale
de8a12e3f5 Merge branch 'merge-3.2/RM-7051_DispositionWebScript' into 'release/V3.2' 
Resolve RM-7051 "Merge 3.2/ dispositionwebscript"

See merge request records-management/records-management!1323
 2019-12-05 12:42:59 +00:00
Ross Gale
4de8b50e4d RM-7051 updating code to deal with held content after 3.2 change 2019-12-04 14:01:54 +00:00
Roxana Lucanu
26cd72a416 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
0143e1989e Merge branch 'merge-2.6/RM-7060_FixSearchAspect' into 'release/V2.6' 
Resolve RM-7060 "Merge 2.6/ fixsearchaspect"

See merge request records-management/records-management!1321
 2019-12-04 13:40:22 +00:00
Roxana Lucanu
2afd579818 Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Ross Gale
f42cd05af3 Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/mergeUp 2019-12-02 08:08:06 +00:00
Ross Gale
05e3238d1d Merge branch 'merge-3.1/mergeUp' into 'release/V3.1' 
Merge 3.1/merge up

See merge request records-management/records-management!1320
 2019-12-02 07:58:27 +00:00
Ross Gale
f5ddb592a0 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
4f65d24c02 Merge branch 'merge-3.0/mergeUp' into 'release/V3.0' 
Merge 3.0/merge up

See merge request records-management/records-management!1319
 2019-11-29 15:52:19 +00:00