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

6147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxana Lucanu
c108b46715 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
25d400d3b5 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
53c2fa77a7 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
80b8dd2bff 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
6fc983a88e 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
Claudia Agache
8e44c76460 Record only merge of version change. 2020-01-14 12:40:28 +02:00
Claudia Agache
b9cc5f5b3a Record only merge of version change. 2020-01-14 12:39:53 +02:00
Claudia Agache
2ebc64e577 Update version to 3.3.0.1-SNAPSHOT 2020-01-14 12:39:07 +02:00
Claudia Agache
d4b62c3329 Update version to 3.3.1-SNAPSHOT 2020-01-14 12:36:02 +02:00
Roxana Lucanu
1954b9bece Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
alfresco-build
340e64c8e1 [maven-release-plugin] prepare for next development iteration 2020-01-13 15:45:31 +00:00
alfresco-build
0353691b4e [maven-release-plugin] prepare release V3.3.0 ags-3.3.0 2020-01-13 15:45:26 +00:00
Roxana Lucanu
f85f9f3a05 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Christopher Shields
34fb6224d9 Merge branch 'feature/RM-7101_DeleteHold_Upgrade_Patch' into 'master' 
RM-7101: [Upgrade] Delete hold audit events are not properly migrated

Closes RM-7101

See merge request records-management/records-management!1348
 2020-01-13 00:00:35 +00:00
Christopher Shields
d9c3d3c219 RM-7101: [Upgrade] Delete hold audit events are not properly migrated 2020-01-13 00:00:34 +00:00
Roxana Lucanu
22e7893940 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
Christopher Shields
b0032f69b2 Merge branch 'feature/RM-7098_AddRemoveFromHolds_Upgrade_Patch' into 'master' 
RM-7098: [Upgrade] Add to Hold and Remove from hold audit events are not properly migrated

Closes RM-7098

See merge request records-management/records-management!1345
 2020-01-10 09:23:06 +00:00
Ramona Popa
8027c10b4b 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
ef6bac0b56 RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
4f74691a9a 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
89d0de6b50 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
gbroadbent
41e06633b5 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
3995c8ef99 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
d0aae1fd32 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
7f66c4a90f 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
c316c43157 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
cd2ff6e461 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
31776aa101 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
386fdb88d4 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
bdb2f80e74 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
7f74862eaa 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
c40b4217cf RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
b9fc4e101f RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
b6b50306b3 RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
8228fe5939 MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Roxana Lucanu
ee306dd59c 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
b1f3d11cf5 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
ecca6fef85 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
155952d28f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
1065c1c064 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
d9e1c21cd6 Update license headers 2020-01-03 10:53:19 +00:00
Sara Aspery
187db478a5 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
e1da6ab294 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
bd67c3bf6b Update license headers 2020-01-02 18:27:23 +00:00
Sara Aspery
f7e69629bb Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
03eee1b8e3 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8 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
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 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