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

5827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Meenal Bhave
3a6b3c994a Merge branch 'feature/Search-1835-IE-GS-Compatibility' into 'master' 
Search-1835: Updated GS Automation to use TAS Rest API Version 6.0.1.2

See merge request records-management/records-management!1232
 2019-09-18 09:52:53 +01:00
Meenal Bhave
7dd104c28e Search-1835: Updated GS Automation to use TAS Rest API Version 6.0.1.2, to be used with IE automation 2019-09-18 09:52:53 +01:00
Rodica Sutu
8d6c50f8d1 Merge remote-tracking branch 'remotes/origin/feature/RM-6949_DropDown' into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-17 13:57:14 +03:00
Rodica Sutu
414be241a4 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6856_BulkRemovalFromHold_Tests 2019-09-17 13:56:53 +03:00
Ross Gale
703f706afc RM-6949 rebase 2019-09-17 11:01:07 +01:00
Ramona Popa
c9fc6baeb8 Merge branch 'feature/RM-6945_DisplayActionForHeldAContentInHold' into 'master' 
RM-6945: Display available actions on held active content inside a hold

Closes RM-6945

See merge request records-management/records-management!1230
 2019-09-16 09:08:14 +01:00
Ramona Popa
066503b515 RM-6945: Display available actions on held active content inside a hold 
- added actions for isFreezeActiveContent
 2019-09-16 09:08:14 +01:00
Roxana Lucanu
0a1cfa0d11 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into 'master' 
RM-6943 AddTo/RemoveFrom hold actions from a collaboration site

Closes RM-6943

See merge request records-management/records-management!1228
 2019-09-16 07:22:54 +01:00
rlucanu
e3e3273ab0 RM-6943 other code review comments 2019-09-13 16:26:27 +03:00
rlucanu
d2c2f14270 RM-6943 code review changes 2019-09-13 13:44:01 +03:00
Ramona Popa
8b14d81e1e RM-6945: Display available actions on held active content inside a hold 
- updated actions for document library
 2019-09-13 10:12:39 +03:00
Ramona Popa
25ef9dcb75 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-13 09:00:27 +03:00
Ramona Popa
a2be7a29f9 RM-6945: Display available actions on held active content inside a hold 
- updated actions
 2019-09-13 08:59:59 +03:00
rlucanu
4b1fec979a RM-6943 added RemoveFromHold evaluator 2019-09-12 17:04:33 +03:00
Ramona Popa
e59b169422 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
50f2457a52 RM-6945: Display available actions on held active content inside a hold 
- fixed actions
 2019-09-12 16:21:23 +03:00
rlucanu
0523ca1d5c RM-6943 Changes on AddToHold evaluator 2019-09-12 12:20:51 +03:00
Ramona Popa
48d8f66046 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
7a8273645d 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
5183b6c389 Merge branch 'feature/RM-6943_AddoToHoldActionInCollabSite' into feature/RM-6945_DisplayActionForHeldAContentInHold 2019-09-10 23:02:19 +03:00
Ramona Popa
cb4c0ef37f 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
c369d53d7c Merge 'origin/master' into feature/RM-6943_AddoToHoldActionInCollabSite 2019-09-10 15:10:15 +03:00
Rodica Sutu
28b1fc7d9c 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
8787bd09e4 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
41d0404d4f 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
b8963f75c8 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
3c957afdbe remove unwanted changes 2019-09-09 13:31:35 +03:00
Rodica Sutu
9588917c66 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
5334623e56 add tests to Bulk Remove from Hold 2019-09-09 12:55:32 +03:00
rlucanu
7e79c86baf RM-6943 adding implementation for AddToHold evaluator 2019-09-06 16:58:52 +03:00
cagache
bc2f13e0f7 Code review comments 2019-09-06 08:50:49 +03:00
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 ags-2.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