inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 330 Branches 2,178 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

299 Commits

Author SHA1 Message Date
Claudia Agache
b4ba2c75ed removed unused import 2020-07-01 16:57:59 +03:00
Rodica Sutu
262e4ab88f Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/MNT-21292_DownloadRecords 2020-02-26 14:59:41 +02:00
Roxana Lucanu
62a72fba4f Merge branch 'release/V3.2' into merge-3.3/RM-7065_RetentionScheduleInheritance 2020-01-29 09:36:53 +02:00
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
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
Sara Aspery
dcc20cbfb4 Update license headers 2020-01-03 10:53:19 +00:00
Sara Aspery
9601805568 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00: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
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
9a048fca1c Merge branch 'release/V3.2' into merge/RM-7060_FixSearchAspect 2019-12-10 14:33:19 +02: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
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
Rodica Sutu
6f3bf7adb9 changes to address code review comments 2019-12-02 15:52:31 +02:00
Rodica Sutu
ddd9c5f360 remove the content property as ContentPropertyRestrictionInterceptor will not allow update of content via nodeService.addProperties 2019-12-02 10:50:35 +02:00
Roxana Lucanu
23300d09cd RM-7060 Fix integration tests 2019-11-27 11:28:32 +02:00
Rodica Sutu
7ca293d815 update min version ACS version for the text context 2019-11-26 16:05:47 +02:00
Rodica Sutu
6b1e06f4aa replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Chris Shields
d8862b1ee3 Code review changes 2019-11-20 11:16:04 +00:00
Chris Shields
a8223fbae8 Code review changes 2019-11-19 21:11:50 +00:00
Chris Shields
54b6a1ea7e Merge branch 'feature/RM-7028_Add_Add_To_Hold_ToAudit' into feature/RM-7029_RemoveFromHold 2019-11-19 12:14:04 +00:00
Chris Shields
22a1c93c83 RM-7029 Audit remove from hold 2019-11-19 12:05:06 +00:00
Sara Aspery
d4ec6dcb80 RM-7028 review updates 2019-11-19 11:15:45 +00:00
Sara Aspery
a2f8d7e717 RM-7028 review updates 2019-11-18 15:59:54 +00:00
Sara Aspery
f4e5a3ecd5 RM-7028 integ test fix, locn refactor, multi files fix 2019-11-16 14:11:06 +00:00
Sara Aspery
2888c6dd10 RM-7028 fix integration tests 2019-11-08 08:35:50 +00:00
Sara Aspery
73fc3ef789 RM-7028 Audit add to hold 2019-11-06 23:20:28 +00:00
Sara Aspery
a4afc023be RM-7027 Audit delete hold 2019-11-06 16:33:38 +00:00
Sara Aspery
caac83aa68 RM-7026 Updated hold name display property 2019-11-06 16:00:53 +00:00
Sara Aspery
5a0ffec5de Merge branch 'master' into feature/RM-7026_Add_HoldCreated_ToAudit 2019-11-06 12:22:36 +00:00
Roxana Lucanu
970bee3228 RM-7034 Fixed unit tests and split class for add/remove from hold tests. 2019-11-04 16:40:18 +02:00
Roxana Lucanu
c1b5f2a82d RM-7034 Merged master 2019-11-04 12:44:38 +02:00
Roxana Lucanu
e079b2f50b RM-7034 Added tests 2019-11-04 12:23:22 +02:00
Sara Aspery
31b81d2024 Merge branch 'master' into 'feature/RM-7026_Add_HoldCreated_ToAudit' 
# Conflicts:
#   rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java
#   rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java
#   rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
 2019-11-04 07:22:27 +00:00
Sara Aspery
1141668d43 RM-7026 Audit Create Hold updates 2019-11-04 07:08:32 +00:00
Ramona Popa
a1be193a3f RM-6860: Add hold service policies 
- Added HoldServicePolicies interface
 2019-11-03 06:47:29 +00:00
Ramona Popa
fcd53d3143 RM-7035: Add policies for holds 
- fixed tests for deleteHold policies
 2019-10-29 16:02:40 +02:00
Ramona Popa
4346fe00f4 RM-7035: Add policies for holds 
- some minor formating
   - fix unit test
 2019-10-25 15:48:10 +03:00