cagache
f5cae4cbca
Merge remote-tracking branch 'remotes/origin/feature/RM-6915_ViewContentsOfLegalHoldUI' into feature/RM-6918_ViewHoldContentTests
2019-09-05 11:13:49 +03:00
cagache
720abc0ab5
Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6918_ViewHoldContentTests
2019-09-05 11:07:53 +03:00
rlucanu
262a9480f3
Merge 'origin/master' into feature/RM-6915_ViewContentsOfLegalHoldUI
2019-09-05 10:53:46 +03:00
cagache
1f0c13438b
Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6918_ViewHoldContentTests
2019-09-05 10:39:31 +03:00
cagache
9fd3d7f9d8
RM-6918 View legal holds content UI tests
2019-09-05 10:26:58 +03:00
Rodica Sutu
11396093b6
Merge branch 'feature/RM-6931_RetentionWIthRetainStepWithFrozenRecords_v2' into 'master'
...
RM-6931 RetentionWithRetainStepOnFrozenRecords
See merge request records-management/records-management!1223
2019-09-05 06:38:36 +01:00
cagache
f5879bb7fb
RM-6918 View legal holds content UI tests
2019-09-04 16:20:43 +03:00
Rodica Sutu
c087c888c6
add an end to end test to check the search disposition schedule properties
2019-09-04 16:07:38 +03:00
Rodica Sutu
15e6b5c107
Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6931_RetentionWIthRetainStepWithFrozenRecords_v2
2019-09-04 14:20:49 +03:00
cagache
d85ca33232
Record only merge of version change.
2019-09-04 11:06:27 +03:00
cagache
29fd680ced
Record only merge of version change.
2019-09-04 10:59:13 +03:00
cagache
cc21d22bf4
Record only merge of version change.
2019-09-04 10:52:52 +03:00
cagache
5584f05cb0
Record only merge of version change.
2019-09-04 10:52:06 +03:00
cagache
9a3f52cc5b
Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/MNT-20740_BinDuplicationHotFix
2019-09-03 17:10:21 +03:00
alfresco-build
b80cbad7c6
[maven-release-plugin] prepare for next development iteration
2019-09-03 13:49:08 +01:00
alfresco-build
fc9df152e5
[maven-release-plugin] prepare release V2.7.2.1
2019-09-03 13:49:04 +01:00
cagache
c1b3decae4
Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/MNT-20740_BinDuplicationHotFix
2019-09-03 13:36:48 +03:00
Rodica Sutu
44c35a454e
remove unwanted logs
2019-09-03 11:36:00 +03:00
cagache
995a771b51
Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix
...
# Conflicts:
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
2019-09-03 10:10:18 +03:00
cagache
af928d3c7d
Merge remote-tracking branch 'remotes/origin/hotfix-2.7/MNT-20740_BinDuplicationHotFix' into release/V2.7
2019-09-03 09:16:44 +03:00
Rodica Sutu
f4f18f1047
disable on properties update for a frozen aspect
2019-09-03 09:01:15 +03:00
Claudia Agache
bb8d99c895
Merge branch 'hotfix-2.7/MNT-20740_BinDuplicationHotFix' into 'release/V2.7.2.x'
...
Resolve MNT-20740 "Hotfix 2.7/ binduplicationhotfix"
See merge request records-management/records-management!1222
2019-09-02 11:37:34 +01:00
cagache
fa48983bb6
apply code style
2019-09-02 13:33:37 +03:00
Sara Aspery
2fe6cdf602
RM-6915_ViewActiveContentInHoldAndFrozenIndicator
2019-08-30 23:41:19 +01:00
Roy Wetherall
a48cb2755c
Deal with review comments
2019-08-30 11:28:44 +10:00
Roy Wetherall
8e26f5aad5
Addition tests for records, fixed up a couple of issues in the query method as a result.
2019-08-29 21:35:00 +10:00
Roy Wetherall
1c539f9f05
Fix issue with inaccurate results returning from content URL query
...
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
2019-08-29 12:28:04 +10:00
Roy Wetherall
211ebba2f2
Add logging to rm query DAO implementation
2019-08-29 09:50:57 +10:00
Rodica Sutu
d02b074670
Merge branch 'feature/RM-6929_RecordFolderWithVitalAndFrozenRecords' into 'master'
...
Resolve RM-6929 "Feature/ recordfolderwithvitalandfrozenrecords"
Closes RM-6929
See merge request records-management/records-management!1221
2019-08-28 13:08:19 +01:00
Rodica Sutu
bcefca962c
code review updates
2019-08-28 10:57:13 +03:00
Rodica Sutu
184673cef1
Add tests for RM-6929
2019-08-27 13:55:54 +03:00
Rodica Sutu
ba9a192950
disable on update properties for frozen items when setting the record search properties
2019-08-27 09:34:30 +03:00
Rodica Sutu
5e516a57b9
Merge branch 'feature/RM-6914_AddRemoveToHold_Tests' into 'master'
...
Resolve RM-6914 "Feature/ addremovetohold tests"
Closes RM-6914
See merge request records-management/records-management!1219
2019-08-23 08:11:06 +01:00
Rodica Sutu
0a26da478b
update the tests to allow remove from hold with a user with read permission, filling permission over the hold and remove from hold capabilities
2019-08-22 14:51:33 +03:00
Sara Aspery
d79caf2466
Merge branch 'feature-2.7/MNT-20740_BinDuplicationHotFix' into hotfix-2.7/MNT-20740_BinDuplicationHotFix
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
2019-08-22 12:29:45 +01:00
Sara Aspery
18bd7d7fac
MNT-20740 New db query
2019-08-22 11:19:34 +01:00
Rodica Sutu
35a76988a2
Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6914_AddRemoveToHold_Tests
2019-08-22 08:48:40 +03:00
Claudia Agache
a03fce52d3
Merge branch 'feature/RM-6911_AddActiveContentToHoldRestAPI' into 'master'
...
RM-6911 Add/Remove Active Content To/From Holds via REST API
See merge request records-management/records-management!1218
2019-08-22 06:36:39 +01:00
cagache
becbf296df
code review comments
2019-08-22 08:30:18 +03:00
cagache
903791e1db
code review comments
2019-08-21 18:56:27 +03:00
cagache
f169e79599
fix tests
2019-08-21 18:38:37 +03:00
cagache
27496b81f1
code review comments
2019-08-21 18:19:18 +03:00
Rodica Sutu
577b2e1a72
Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6914_AddRemoveToHold_Tests
2019-08-21 14:43:43 +03:00
Rodica Sutu
7c5d8058d2
Merge branch 'feature/RM-6911_AddActiveContentToHoldRestAPI' of https://git.alfresco.com/records-management/records-management into feature/RM-6914_AddRemoveToHold_Tests
2019-08-21 14:43:27 +03:00
Rodica Sutu
0e4501d27a
minor updates of the java doc and code style
2019-08-21 14:41:05 +03:00
Rodica Sutu
0d85f2cadd
code review changes
2019-08-21 12:03:01 +03:00
Ross Gale
1575124fd7
Merge branch 'feature/RM-6873_RemoveActiveContentFromHold' into 'master'
...
RM-6873 adding code to allow for the removal of active content from a hold
See merge request records-management/records-management!1216
2019-08-21 08:44:56 +01:00
Claudia Agache
9cea6d9344
Merge branch 'feature/RM-6926_AddFrozenNodeToAnotherHold' into 'master'
...
RM-6926 Don't trigger onUpdateProperties policy when a frozen node is added to another hold
Closes RM-6926
See merge request records-management/records-management!1220
2019-08-21 07:14:59 +01:00
cagache
bee8d09bd4
Merge changes from feature/RM-6873_RemoveActiveContentFromHold
2019-08-20 16:54:58 +03:00
Ross Gale
40767c1b59
RM-6873 adding code review changes
2019-08-20 13:58:26 +01:00
