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

918 Commits

Author SHA1 Message Date
Roxana Lucanu
d7b0c08916 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
6a65308383 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00
Roxana Lucanu
2ddd48d23d RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
5a645d39ed RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
aaf18955be 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
7b6db44df4 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02: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
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
dbde8cefbb RM-7065 fix integration test 2020-01-09 20:21:29 +02: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
Ross Gale
2dd9015ad8 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +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
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
3c13cba8b5 Merge branch 'release/V3.1' into merge-3.2/RM-7060_FixSearchAspect 2019-12-10 09:09:56 +02: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
d67218cbb1 Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02: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
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
f5ddb592a0 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
d0487f17d7 fix conflicts 2019-11-29 10:59:47 +00:00
Roxana Lucanu
2b7541b501 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02: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
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
7a9b4bcb78 Merge branch 'feature/RM-7014_CheckForRmSite' into 'master' 
RM-7014 add code to check an rm site has been created before running the...

Closes RM-7014

See merge request records-management/records-management!1277
 2019-10-19 11:26:07 +01:00
Ross Gale
0de5888170 Update RMv32HoldChildAssocPatch.java 2019-10-18 18:34:03 +01:00
Ross Gale
dd0d032895 RM-7014 code review comments 2019-10-18 14:26:48 +01:00
Ross Gale
83fcbd62e6 RM-7014 add code to check an rm site has been created before running the patches that require an rm site 2019-10-17 17:49:01 +01:00
Ramona Popa
5140c9208e RM-7003: [Upgrade] Generate Hold Report fails for a hold if has active content 
- added new the patch to update the hold report template
 2019-10-17 08:06:15 +01:00
Ross Gale
61ac4d9e41 Removing unused import from RMv32HoldChildAssocPatch.java 2019-10-16 08:46:16 +01:00
Ross Gale
84380dde3f Resolve RM-6995 "Feature/ createnewassocpatch" 2019-10-15 14:17:39 +01:00
Ross Gale
7133ecc84f RM-6993 replace old assoc with new 2019-10-08 13:25:30 +01:00