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
Rodica Sutu
b719e97bd7 Merge branch 'feature/RM-7012_ActionNameInListOfValuesForAudit' into 'master' 
RM-7012

See merge request records-management/records-management!1280

(cherry picked from commit 2b7caed6aa)
 2020-02-21 15:04:35 +02:00
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
Roxana Lucanu
5d11691353 Record only merge 2020-02-19 10:32:35 +02:00
Roxana Lucanu
fff717b9b1 Record only merge 2020-02-19 10:25:14 +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
dec66f6358 Record only merge 2020-02-11 06:34:26 +00:00
Ramona Popa
053a78cf7c Merge branch 'feature/merge_RM-7111_from_3.3' into 'master' 
Feature/merge rm 7111 from 3.3

Closes RM-7108

See merge request records-management/records-management!1379
 2020-02-10 12:13:10 +00:00
Ramona Popa
7d274d351c RM-7111: AGS 3.3 can't be installed on ACS 6.1 
- added alfresco.min.version to 6.1
 2020-02-10 12:13:10 +00:00
Claudia Agache
d73c945397 Record only merge. 2020-02-06 13:07:59 +00: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
Rodica Sutu
6a0c915fb5 Merge branch 'feature/RM-7053_FixCmisQueryTest' into 'master' 
Resolve RM-7053 "Feature/ fixcmisquerytest"

Closes RM-7053

See merge request records-management/records-management!1372
 2020-02-05 14:36:32 +00:00
Ramona Popa
6819c656eb Record only merge of version change. 2020-02-05 14:32:41 +02:00
Ramona Popa
7168080c46 Merge branch 'feature-3.3/merge_3.3.0.x_to_3.3' into 'release/V3.3' 
Feature 3.3/merge 3.3.0.x to 3.3

See merge request records-management/records-management!1377
 2020-02-05 12:28:31 +00:00
Ramona Popa
0f7cc3b94c RM-7111: AGS 3.3 can't be installed on ACS 6.1 
- added alfresco.min.version to 6.1
 2020-02-05 12:28:31 +00:00
alfresco-build
2397d079d8 [maven-release-plugin] prepare for next development iteration 2020-02-04 13:19:09 +00:00
alfresco-build
c2e3e226f8 [maven-release-plugin] prepare release V3.3.0.1 2020-02-04 13:19:05 +00:00
Ramona Popa
091105f454 Merge branch 'feature-3.3/merge_RM-7053_to_3.3.0' into 'release/V3.3.0.x' 
Merge branch 'feature-3.3/RM-7053_FixCmisQueryTest' into 'release/V3.3'

See merge request records-management/records-management!1374
 2020-02-03 11:51:17 +00:00
Ramona Popa
e661cebc8b Merge branch 'feature-3.3/RM-7053_FixCmisQueryTest' into 'release/V3.3' 
RM-7053_FixCmisQueryTest

See merge request records-management/records-management!1365
 2020-02-03 11:51:17 +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
b34ea13cec Merge branch 'hotfix-3.3/RM-7110_UpgradeTo3.3Fails' into 'release/V3.3.0.x' 
RM-7110: Patch rm.holdAuditValuesUpdatedPatch fails to be executed when doing...

See merge request records-management/records-management!1370
 2020-01-31 14:24:07 +00:00
Ramona Popa
fdfdc6ad70 RM-7110: Patch rm.holdAuditValuesUpdatedPatch fails to be executed when doing upgrade from 3.1 to 3.3 
- check if property exists before trying to update it
 2020-01-31 14:24:07 +00:00
Ramona Popa
c2e2e1400b Merge branch 'hotfix-3.3/RM-7111_AGS_3.3_with_ACS_6.1' into 'release/V3.3.0.x' 
RM-7111: AGS 3.3 can't be installed on ACS 6.1

See merge request records-management/records-management!1371
 2020-01-31 14:02:36 +00:00
Ramona Popa
54010e5576 RM-7111: AGS 3.3 can't be installed on ACS 6.1 
- added alfresco.min.version to 6.1
 2020-01-31 14:02:36 +00:00
Rodica Sutu
442e1e6928 Merge remote-tracking branch 'remotes/origin/release/V3.3' into feature/RM-7053_FixCmisQueryTest 2020-01-31 15:16:33 +02:00
Rodica Sutu
4ce3d763ed Merge branch 'feature-3.3/RM-7053_FixCmisQueryTest' into 'release/V3.3' 
RM-7053_FixCmisQueryTest

See merge request records-management/records-management!1365
 2020-01-31 12:47:53 +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
Roxana Lucanu
90310a82b8 Merge branch 'merge/RM-7065_RetentionScheduleInheritance' into 'master' 
Resolve RM-7065 "Merge/ retentionscheduleinheritance"

Closes RM-7065, RM-7099, and MNT-20822

See merge request records-management/records-management!1367
 2020-01-31 07:28:50 +00:00
Ramona Popa
11ec50acd3 increase sleep time 2020-01-30 08:50:16 +02:00
Ramona Popa
63d1b5a571 RM-7099: Update or Ignore Quarantined Tests 
- updated DeclareAndFileDocumentAsRecordTests to delete the created hold before delete the created category
 2020-01-30 08:05:19 +02: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
Rodica Sutu
2abb3675d8 Merge branch 'release/V3.3' of https://git.alfresco.com/records-management/records-management into feature-3.3/RM-7053_FixCmisQueryTest 2020-01-29 15:45:29 +02:00
Rodica Sutu
4d743591b8 address review comments 2020-01-29 15:45:13 +02:00
Roxana Lucanu
c2a5c3f9ce Merge branch 'release/V3.3' into merge/RM-7065_RetentionScheduleInheritance 2020-01-29 13:50:44 +02:00
Roxana Lucanu
6582c75cb6 Merge branch 'merge-3.3/RM-7065_RetentionScheduleInheritance' into 'release/V3.3' 
Resolve RM-7065 "Merge 3.3/ retentionscheduleinheritance"

See merge request records-management/records-management!1364
 2020-01-29 11:48:59 +00:00
Rodica Sutu
aa03510779 Merge branch 'release/V3.3' of https://git.alfresco.com/records-management/records-management into feature-3.3/RM-7053_FixCmisQueryTest 2020-01-29 12:52:06 +02:00
Rodica Sutu
53f2825a58 increase the sleep max time 2020-01-29 10:37:01 +02:00
Rodica Sutu
8054c04caf fix header for community file 2020-01-29 10:13:05 +02:00
Rodica Sutu
d3284b1400 move the cmis query tests 
add some additional usecase
 2020-01-29 09:46:04 +02:00