Commit Graph

6147 Commits

Author SHA1 Message Date
Ramona Popa
741373a832 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
5fbd659e73 [maven-release-plugin] prepare for next development iteration 2020-02-04 13:19:09 +00:00
alfresco-build
8546c0ab2a [maven-release-plugin] prepare release V3.3.0.1 ags-3.3.0.1 2020-02-04 13:19:05 +00:00
Ramona Popa
66cf80d2b7 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
c0657e8933 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
597b6a063e 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
0fd1adfc6e merge RM-7099 into V3.0 2020-01-31 16:13:09 +00:00
Ramona Popa
bb99613b8a 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
d73bd36674 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
7ce514359e 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
fc4ecc13d2 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
649cb682f3 Merge remote-tracking branch 'remotes/origin/release/V3.3' into feature/RM-7053_FixCmisQueryTest 2020-01-31 15:16:33 +02:00
Rodica Sutu
2ceb23f2f7 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
65bbf747b4 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
138ad5633a RM-7099: Update or Ignore Quarantined Tests
- removed delete hold from test
2020-01-31 09:52:55 +00:00
Roxana Lucanu
15b00f42e1 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
a3739bafbe increase sleep time 2020-01-30 08:50:16 +02:00
Ramona Popa
43dd3413d4 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
e99b567900 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
553e138932 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
f49b89782a 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
946373c74b address review comments 2020-01-29 15:45:13 +02:00
Roxana Lucanu
3af4d48103 Merge branch 'release/V3.3' into merge/RM-7065_RetentionScheduleInheritance 2020-01-29 13:50:44 +02:00
Roxana Lucanu
5f2b08b5ed 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
80e07bb645 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
a388628b6f increase the sleep max time 2020-01-29 10:37:01 +02:00
Rodica Sutu
1b03a65bb4 fix header for community file 2020-01-29 10:13:05 +02:00
Rodica Sutu
c20cfb3c6f move the cmis query tests
add some additional usecase
2020-01-29 09:46:04 +02:00
Roxana Lucanu
ad026aec83 Merge branch 'release/V3.2' into merge-3.3/RM-7065_RetentionScheduleInheritance 2020-01-29 09:36:53 +02:00
Roxana Lucanu
b8c02f171b 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
f78453a730 Merge branch 'release/V3.1' into merge-3.2/RM-7065_RetentionScheduleInheritance 2020-01-28 15:18:35 +02:00
Roxana Lucanu
4d46f4dcf4 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
cebfbdc7eb 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
ac1fd8a7cd 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
09769e3cc2 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00
Roxana Lucanu
f8adb1bdf6 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
8d31a0b57b RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
1e33006413 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
59e0979070 RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
1f09c8454e Merge branch 'release/v2.6' into merge-2.7/RM-7065_RetentionScheduleInheritance 2020-01-27 10:46:44 +02:00
Roxana Lucanu
26b2d55140 Merge branch 'revert-b562d979' 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
b2011a8a52 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
ced4d68a02 Merge branch 'revert-80b8dd2b' 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
de34a72e33 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
818a2a5c85 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
e2dfa50dfb RM-7099: Update or Ignore Quarantined Tests
- Fixed some tests and ignore some others
2020-01-22 07:35:23 +00:00
Roxana Lucanu
b562d97966 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
db4dc1f016 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
4a41a8cdf5 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
4b01395ae6 RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00