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
5,816 Commits 324 Branches 2,170 Tags
b36b4e31cb15d4c2cbe7fd5d7c004f783553f6ca
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ramona Popa
db9f55822e Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-13 09:00:27 +03:00
Ramona Popa
d0f3e1124d RM-6945: Display available actions on held active content inside a hold 
- updated actions
 2019-09-13 08:59:59 +03:00
rlucanu
12e1eeea85 RM-6943 added RemoveFromHold evaluator 2019-09-12 17:04:33 +03:00
Ramona Popa
f75e0f700a Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
 2019-09-12 16:26:40 +03:00
Ramona Popa
11c0b7dbee RM-6945: Display available actions on held active content inside a hold 
- fixed actions
 2019-09-12 16:21:23 +03:00
rlucanu
df5a142b43 RM-6943 Changes on AddToHold evaluator 2019-09-12 12:20:51 +03:00
Ramona Popa
a10acd43f3 RM-6945: Display available actions on held active content inside a hold 
- added uiType frozen content
 2019-09-11 16:26:56 +03:00
Ramona Popa
9e4c04c44f RM-6945: Display available actions on held active content inside a hold 
- reverted allow method to be executed by non rm
 2019-09-11 11:23:53 +03:00
Ramona Popa
523dad44bb Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-10 23:02:19 +03:00
Ramona Popa
041bc9071b RM-6945: Display available actions on held active content inside a hold 
- allow method to be executed by non rm
 2019-09-10 23:00:53 +03:00
rlucanu
df2bc0a4cc Merge 'origin/master' into feature/RM-6943_AddoToHoldActionInCollabSite 2019-09-10 15:10:15 +03:00
Rodica Sutu
8d6924dfd1 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-10 09:16:48 +03:00
Claudia Agache
791f4439b7 Merge branch 'feature/RM-6918_ViewHoldContentTests' into 'master' 
RM-6918 View Hold Contents tests

Closes RM-6918

See merge request records-management/records-management!1227
 2019-09-10 07:08:09 +01:00
Sara Aspery
ac22394253 Merge branch 'feature/RM-6915_ViewContentsOfLegalHoldUI' into 'master' 
Resolve RM-6915 "Feature/ viewcontentsoflegalholdui"

Closes RM-6915

See merge request records-management/records-management!1226
 2019-09-09 20:57:03 +01:00
Ramona Popa
89d685f2c3 RM-6945: Display available actions on held active content inside a hold 
- added actions for isFreezeActiveContent
 2019-09-09 22:10:55 +03:00
Rodica Sutu
408f601f8e remove unwanted changes 2019-09-09 13:31:35 +03:00
Rodica Sutu
1b7c2da263 Merge remote-tracking branch 'remotes/origin/feature/RM-6918_ViewHoldContentTests' into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-09 13:24:25 +03:00
Rodica Sutu
a34fd6f70b add tests to Bulk Remove from Hold 2019-09-09 12:55:32 +03:00
rlucanu
846c96acc3 RM-6943 adding implementation for AddToHold evaluator 2019-09-06 16:58:52 +03:00
cagache
2ea8180a79 Code review comments 2019-09-06 08:50:49 +03:00
cagache
c4a897ef09 Merge remote-tracking branch 'remotes/origin/feature/RM-6915_ViewContentsOfLegalHoldUI' into feature/RM-6918_ViewHoldContentTests 2019-09-05 11:13:49 +03:00
cagache
0f4d54c185 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6918_ViewHoldContentTests 2019-09-05 11:07:53 +03:00
rlucanu
6267111dd1 Merge 'origin/master' into feature/RM-6915_ViewContentsOfLegalHoldUI 2019-09-05 10:53:46 +03:00
cagache
51cc171a8a Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6918_ViewHoldContentTests 2019-09-05 10:39:31 +03:00
cagache
d9300606ec RM-6918 View legal holds content UI tests 2019-09-05 10:26:58 +03:00
Rodica Sutu
79f1aebd98 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
f6dd63519f RM-6918 View legal holds content UI tests 2019-09-04 16:20:43 +03:00
Rodica Sutu
da6d3c454a add an end to end test to check the search disposition schedule properties 2019-09-04 16:07:38 +03:00
Rodica Sutu
7d0ee221ac 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
ed028ee8d3 Record only merge of version change. 2019-09-04 11:06:27 +03:00
cagache
852940d923 Record only merge of version change. 2019-09-04 10:59:13 +03:00
cagache
3b16167038 Record only merge of version change. 2019-09-04 10:52:52 +03:00
cagache
dda4bed524 Record only merge of version change. 2019-09-04 10:52:06 +03:00
cagache
1fa85668b0 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/MNT-20740_BinDuplicationHotFix 2019-09-03 17:10:21 +03:00
alfresco-build
2e73a1ee1b [maven-release-plugin] prepare for next development iteration 2019-09-03 13:49:08 +01:00
alfresco-build
2808df576c [maven-release-plugin] prepare release V2.7.2.1 2019-09-03 13:49:04 +01:00
cagache
c8e9c34c62 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
40e32b4b01 remove unwanted logs 2019-09-03 11:36:00 +03:00
cagache
045f19f8d9 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
fc5539d2e2 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
522dcb6b89 disable on properties update for a frozen aspect 2019-09-03 09:01:15 +03:00
Claudia Agache
8c38129bcc 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
1f6bb8c277 apply code style 2019-09-02 13:33:37 +03:00
Sara Aspery
7126a10094 RM-6915_ViewActiveContentInHoldAndFrozenIndicator 2019-08-30 23:41:19 +01:00
Roy Wetherall
02411e3e59 Deal with review comments 2019-08-30 11:28:44 +10:00
Roy Wetherall
88e538ddbb 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
e282c0584e 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
4518cd8615 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Rodica Sutu
455a236bd0 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
b6ab2fb235 code review updates 2019-08-28 10:57:13 +03:00