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

6415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ross Gale
b53f460398 Record only merge of version change. 2019-11-29 12:12:07 +00:00
Ross Gale
d0487f17d7 fix conflicts 2019-11-29 10:59:47 +00:00
Roxana Lucanu
a649ac8aa0 Merge branch 'feature-2.5/RM-7060_FixSearchAspect' into 'release/V2.5' 
RM-7060 Reapply search aspect when filing/moving

See merge request records-management/records-management!1315
 2019-11-28 13:22:55 +00:00
Roxana Lucanu
23300d09cd RM-7060 Fix integration tests 2019-11-27 11:28:32 +02:00
Roxana Lucanu
2b7541b501 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Ross Gale
9806fb2f9c Merge branch 'merge-2.7/RM-7051_RecordOnly' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ recordonly"

See merge request records-management/records-management!1311
 2019-11-26 13:24:29 +00:00
Ross Gale
f2f49c0b5e Record only merge of version change. 2019-11-26 11:36:53 +00:00
Ross Gale
c2bf8ff202 Merge branch 'merge-2.6/RM-7051_RecordOnly' into 'release/V2.6' 
Resolve RM-7051 "Merge 2.6/ recordonly"

See merge request records-management/records-management!1310
 2019-11-26 11:28:38 +00:00
Ross Gale
26804bfffe Record only merge of version change. 2019-11-26 11:22:35 +00:00
Ross Gale
3eedbf0836 Merge branch 'merge-2.5/RM-7051_RecordOnly' into 'release/V2.5' 
Resolve RM-7051 "Merge 2.5/ recordonly"

See merge request records-management/records-management!1309
 2019-11-26 11:16:17 +00:00
Ross Gale
1214128e2b Record only merge of version change. 2019-11-26 10:38:34 +00:00
Ross Gale
72c1e02832 Merge branch 'merge-2.7/RM-7051_MergeUp' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ mergeup"

See merge request records-management/records-management!1308
 2019-11-26 08:43:17 +00:00
Ross Gale
98f0487068 Update version.properties 2019-11-25 08:35:50 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
2b2c0b6d55 Merge branch 'merge-2.6/RM-7051_mergeUp' into 'release/V2.6' 
Resolve RM-7051 "Merge 2.6/ mergeup"

See merge request records-management/records-management!1306
 2019-11-22 18:15:24 +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
Ross Gale
705a2daaf8 Merge branch 'merge-2.5/RM-7051_mergeUp' into 'release/V2.5' 
Resolve RM-7051 "Merge 2.5/ mergeup"

See merge request records-management/records-management!1305
 2019-11-22 14:25:27 +00:00
Ross Gale
92c8c2db21 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
Ross Gale
b6a7b93a52 Updating version number after release 2019-11-22 08:55:41 +00:00