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,269 Commits 330 Branches 2,178 Tags
06de12a10cdee972aef9f7ad4ea5cd5e10c752cc
Commit Graph

6269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d782ea12a9 Merge branch 'merge-3.2/RM-7065_RetentionScheduleInheritance' into 'release/V3.2' 
Resolve RM-7065 "Merge 3.2/ retentionscheduleinheritance"

See merge request records-management/records-management!1363
 2020-01-29 07:34:24 +00: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
f5ecb58bc7 Merge branch 'merge-3.1/RM-7065_RetentionScheduleInheritance' into 'release/V3.1' 
Resolve RM-7065 "Merge 3.1/ retentionscheduleinheritance"

See merge request records-management/records-management!1361
 2020-01-28 13:08:43 +00:00
Ramona Popa
470699ffcf Merge branch 'feature/mergeto33_RM-7099' into 'release/V3.3' 
Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master'

See merge request records-management/records-management!1355
 2020-01-28 09:27:23 +00:00
Ramona Popa
2f2c31dfe6 Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master' 
Resolve RM-7099 "Feature/ updateorignorequarantinedtests"

Closes RM-7099

See merge request records-management/records-management!1354
 2020-01-28 09:27:23 +00: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
533b4c8ef1 Merge branch 'merge-3.0/RM-7065_RetentionScheduleInheritance' into 'release/V3.0' 
Resolve RM-7065 "Merge 3.0/ retentionscheduleinheritance"

See merge request records-management/records-management!1360
 2020-01-28 07:48:33 +00: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
658bd53535 Merge branch 'merge-2.7/RM-7065_RetentionScheduleInheritance' into 'release/V2.7' 
Resolve RM-7065 "Merge 2.7/ retentionscheduleinheritance"

See merge request records-management/records-management!1358
 2020-01-27 15:04:41 +00:00
Roxana Lucanu
5a645d39ed RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
8bd1e384b2 Merge branch 'release/v2.6' into merge-2.7/RM-7065_RetentionScheduleInheritance 2020-01-27 10:46:44 +02:00
Roxana Lucanu
d5cc12faaa Merge branch 'revert-93f966a3' into 'release/V2.7' 
Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"

See merge request records-management/records-management!1357
 2020-01-27 08:43:59 +00: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
9f8dcc0c0b Merge branch 'revert-ffc768cb' into 'release/V2.6' 
Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'"

See merge request records-management/records-management!1356
 2020-01-27 08:16:04 +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
Ramona Popa
7505c3b36a Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master' 
Resolve RM-7099 "Feature/ updateorignorequarantinedtests"

Closes RM-7099

See merge request records-management/records-management!1354
 2020-01-22 07:35:23 +00:00
Ramona Popa
bb207756d4 RM-7099: Update or Ignore Quarantined Tests 
- Fixed some tests and ignore some others
 2020-01-22 07:35:23 +00:00
Roxana Lucanu
93f966a345 Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7' 
Resolve RM-7065 "Merge 2.7/ mnt 20822"

See merge request records-management/records-management!1353
 2020-01-20 18:16:54 +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
83e342ec06 Merge branch 'merge-2.6/RM-5733_portingFix' into 'release/V2.6' 
RM-5733 porting fix - cherry picked commit a2f515a6

See merge request records-management/records-management!1352
 2020-01-20 09:23:47 +00:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
7384b3f160 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
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
e0fc20b01d 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
d91d9a7e0d Record only merge of version change. 2020-01-14 12:40:28 +02:00
Claudia Agache
3eaf3bfeab Record only merge of version change. 2020-01-14 12:39:53 +02:00
Claudia Agache
467bebf68d Update version to 3.3.0.1-SNAPSHOT 2020-01-14 12:39:07 +02: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
46f2b85373 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
b6c7a504c1 RM-7101: [Upgrade] Delete hold audit events are not properly migrated 2020-01-13 00:00:34 +00:00
Roxana Lucanu
3794ddbca3 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
f5d9c257b0 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
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
a81409f821 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
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