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,805 Commits 324 Branches 2,170 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

2040 Commits

Author SHA1 Message Date
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
e0835f9e82 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
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
Claudia Agache
0eb189e880 Update version to 3.3.1-SNAPSHOT 2020-01-14 12:36:02 +02: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
alfresco-build
5d84243fae [maven-release-plugin] prepare for next development iteration 2020-01-13 15:45:31 +00:00
alfresco-build
bbb7eb2d3c [maven-release-plugin] prepare release V3.3.0 2020-01-13 15:45:26 +00:00
Roxana Lucanu
48bb960725 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Christopher Shields
b6c7a504c1 RM-7101: [Upgrade] Delete hold audit events are not properly migrated 2020-01-13 00:00:34 +00:00
Ramona Popa
a3574f7f2b 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
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
gbroadbent
013b8bcd18 RUSSIAN: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Full fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 11:01:56 +00:00
gbroadbent
3179b305e3 SIMPLIFIED CHINESE: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:21:57 +00:00
gbroadbent
ed3bc83368 BRAZILIAN PORTUGUESE: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:20:39 +00:00
gbroadbent
e4841f8250 DUTCH: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:20:05 +00:00
gbroadbent
c33eaafd72 NORWEGIAN Bokmal: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:19:30 +00:00
gbroadbent
51bdbc1bb6 JAPANESE: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:19:01 +00:00
gbroadbent
97f241a748 ITALIAN: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:18:32 +00:00
gbroadbent
3c5274e655 FRENCH: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:18:02 +00:00
gbroadbent
b445a0d533 SPANISH: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:17:37 +00:00
gbroadbent
1b1b1d8cb7 GERMAN: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:16:58 +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
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
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
Sara Aspery
b35dcb14a3 RM-7062 fix for failing tests 2019-12-20 02:20:13 +00:00
Sara Aspery
105da8eecf RM-7062 add noderef to audit entry for hold 2019-12-19 22:46:07 +00:00
Sara Aspery
2c3a3e3726 RM-7062 fix integration tests 2019-12-17 08:37:15 +00:00
Sara Aspery
422ecf403a Merge branch 'master' into feature/RM-7062_NoReadOnHoldCanSeeAuditEvent 2019-12-15 08:46:11 +00:00
Sara Aspery
f4dce089df RM-7062 Updates from review 2019-12-15 07:17:59 +00:00