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
6,415 Commits 324 Branches 2,170 Tags
ffa8053444d4af85b51a07692749f886355bae4a
Commit Graph

291 Commits

Author SHA1 Message Date
Claudia Agache
166d6a7afa Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7154UnitTests_no 2020-04-14 13:22:15 +03:00
Claudia Agache
4a8c5c337d Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7154UnitTests_no 2020-04-14 11:36:46 +03:00
Claudia Agache
26a96c9645 Mock search language to afts 
(cherry picked from commit b8acf45b53)
 2020-04-14 09:22:00 +03:00
Claudia Agache
da063ffa3c Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit c7a55840

(cherry picked from commit 3e5d9d6ba3)
 2020-04-14 09:21:57 +03:00
Claudia Agache
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
#	rm-enterprise/pom.xml
 2020-04-08 15:14:00 +03:00
Claudia Agache
d222954e15 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion 
# Conflicts:
#	rm-enterprise/pom.xml
 2020-04-03 16:21:40 +03:00
Tom Page
2f476bdb0d RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Tom Page
0aac29261b Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
51f4afbc1b Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
c40cf70c96 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
0e7ac0f0c5 RM-7119 Throw explicit exception rather than logging message. 
Also address other code review comments.
 2020-02-27 07:55:40 +00:00
Tom Page
db852d52e5 RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Sara Aspery
f90586ce32 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
16b6678fd3 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
fb014ba5dc Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
304180f49e Merge branch 'release/V2.7' into release/V3.0 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
 2020-01-02 16:15:49 +00:00
Sara Aspery
5849812683 Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45 Merge branch 'release/V2.6' into release/V2.7 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
 2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Ross Gale
7a9b4bcb78 Merge branch 'feature/RM-7014_CheckForRmSite' into 'master' 
RM-7014 add code to check an rm site has been created before running the...

Closes RM-7014

See merge request records-management/records-management!1277
 2019-10-19 11:26:07 +01:00
Ross Gale
83fcbd62e6 RM-7014 add code to check an rm site has been created before running the patches that require an rm site 2019-10-17 17:49:01 +01:00
Ramona Popa
5140c9208e RM-7003: [Upgrade] Generate Hold Report fails for a hold if has active content 
- added new the patch to update the hold report template
 2019-10-17 08:06:15 +01:00
Ross Gale
3b0593d6c6 Removing unused imports from RMv32HoldChildAssocPatchUnitTest.java 2019-10-16 08:48:01 +01:00
Ross Gale
84380dde3f Resolve RM-6995 "Feature/ createnewassocpatch" 2019-10-15 14:17:39 +01:00
Ross Gale
7133ecc84f RM-6993 replace old assoc with new 2019-10-08 13:25:30 +01:00
Ross Gale
87ff9e6fc8 RM-6928 adding check to allow specified properties on frozen nodes to be updated 2019-09-24 16:45:51 +01: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
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
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
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
Sara Aspery
ecbaa3b40c MNT-20740 New db query 2019-08-22 11:19:34 +01:00
cagache
b5899184ca code review comments 2019-08-22 08:30:18 +03:00
cagache
2410fdb234 code review comments 2019-08-21 18:56:27 +03:00
cagache
d393df0136 fix tests 2019-08-21 18:38:37 +03:00
cagache
20feb42ecd code review comments 2019-08-21 18:19:18 +03:00
cagache
dd6b16c1a5 Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 16:54:58 +03:00
Ross Gale
b14b52dd92 RM-6873 adding code review changes 2019-08-20 13:56:14 +01:00
cagache
ee9efedebe Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 08:09:32 +03:00
Ross Gale
9c6f4e79ad RM-6873 adding changes from update branch and updating tests 2019-08-19 15:56:10 +01:00
cagache
055ccfd968 Added check for Remove From Hold capability 2019-08-19 09:32:33 +03:00
cagache
21f341f40a Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-16 09:44:56 +03:00
Ross Gale
8a0067aae9 RM-6873 adding unit tests for edit 2019-08-16 07:25:19 +01:00
cagache
c4076c284a Moved instanceOf method from ServiceBaseImpl class to a utility class 2019-08-14 17:04:04 +03:00
cagache
696a2c32ab Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-14 15:22:27 +03:00
Ross Gale
8aef468927 RM-6873 code review changes 2019-08-14 11:20:18 +01:00
cagache
eda69a6eb6 Do not allow addition of locked content to holds 2019-08-13 17:10:06 +03:00
cagache
ce8eb66ab3 Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-09 12:53:03 +03:00
cagache
944ed16674 Add active content to hold through rest api 2019-08-09 12:07:24 +03:00