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

6415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
ab196dd083 move test DownloadAsZipRecordTest into rm enterprise package as there is no ACS 6.1.1 community equivalent and the issue is not reproducing with ACS community 6.1.2-ga 2020-02-21 11:23:32 +02:00
Rodica Sutu
4e24830ca2 revert unwanted changes 2020-02-20 12:53:54 +02:00
Rodica Sutu
76be91b8e2 update the ACS library versions in order to have the changes that cause download post to work 2020-02-20 10:11:22 +02:00
Rodica Sutu
e50ab2bf27 Merge branch 'feature/RM-7006_UpdateToACS611' into 'master' 
RM-7006 Update to ACS 6.1.1

Closes RM-7006

See merge request records-management/records-management!1272
 2020-02-19 19:56:11 +02:00
Rodica Sutu
ec5693c178 Record only merge headers update. 2020-02-19 08:50:53 +02:00
Rodica Sutu
a94353e78a cherry pick 
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/DownloadAsZipRecordTest.java
 2020-02-18 16:32:43 +02:00
Rodica Sutu
1d50d5b3d5 update the assoc policy for the case when the create assoc source node is not a file plan component node 2020-02-18 16:31:20 +02:00
Rodica Sutu
424707c740 Merge branch 'hotfix-3.2/MNT-21292_UpdateHeadersCherryPick' into 'release/V3.2.0.x' 
Hotfix 3.2/ updateheaderscherrypick"

See merge request records-management/records-management!1386
 2020-02-18 14:16:14 +00:00
Sara Aspery
6c57774ca7 Update license headers 2020-02-18 11:10:36 +02:00
Sara Aspery
2933ce1e6c Merge branch 'release/V3.1' into release/V3.2 2020-02-18 11:07:45 +02:00
Claudia Agache
6f8ecfd7e7 Record only merge. 2020-02-06 13:06:11 +00:00
Claudia Agache
d2246450b0 Record only merge. 2020-02-06 12:58:24 +00:00
Ramona Popa
7e9994d78d Merge branch 'feature-3.0/merge_RM-7099' into 'release/V3.0' 
merge RM-7099 into V3.0

See merge request records-management/records-management!1373
 2020-01-31 16:13:09 +00:00
Ramona Popa
852c77477e merge RM-7099 into V3.0 2020-01-31 16:13:09 +00:00
Ramona Popa
87cacd4b35 Merge branch 'feature-3.1/merge_RM-7099' into 'release/V3.1' 
merge RM-7099 into V3.1

See merge request records-management/records-management!1368
 2020-01-31 09:52:56 +00:00
Ramona Popa
353520afd3 RM-7099: Update or Ignore Quarantined Tests 
- removed delete hold from test
 2020-01-31 09:52:55 +00:00
Ramona Popa
c8d504a321 Merge branch 'feature-3.2/merge_RM-7099' into 'release/V3.2' 
Merge branch 'feature/mergeto33_RM-7099' into 'release/V3.3'

See merge request records-management/records-management!1362
 2020-01-29 15:21:14 +00:00
Ramona Popa
ae77c261d5 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-29 15:21:14 +00: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
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
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
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
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
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
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