inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,672 Commits 330 Branches 2,178 Tags
e784c65fde2d68e3709f7c4384eca1269ce9d2bc
Commit Graph

291 Commits

Author SHA1 Message Date
Claudia Agache
c3475aa5f1 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
5834b86e10 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
00fa62af20 Mock search language to afts 
(cherry picked from commit e0ab98f8b4)
 2020-04-14 09:22:00 +03:00
Claudia Agache
5d7d10aca9 Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit 2aafa463

(cherry picked from commit 0e0bb6137c)
 2020-04-14 09:21:57 +03:00
Claudia Agache
2aafa46388 Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
06d0f76284 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
353ff7b8ee 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
94b209e0ea RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Tom Page
44aa3b4f82 Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
Tom Page
56f1549d7d Merge release/V3.0 into release/V3.1. 2020-02-28 12:43:29 +00:00
Tom Page
eeb23b51e1 Merge release/V2.7 into release/V3.0. 2020-02-28 08:08:29 +00:00
Tom Page
ddae9fbd64 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
ff9be3024b RM-7119 Fix startup with ACS 5.2.7. 2020-02-26 16:32:52 +00:00
Tom Page
4b01395ae6 RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Sara Aspery
e1da6ab294 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
f7e69629bb Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
841340c1e8 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
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 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
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Ross Gale
1608781182 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
6c1808731b 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
5bae9d32a1 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
1e236e085f Removing unused imports from RMv32HoldChildAssocPatchUnitTest.java 2019-10-16 08:48:01 +01:00
Ross Gale
1c30a04c5b Resolve RM-6995 "Feature/ createnewassocpatch" 2019-10-15 14:17:39 +01:00
Ross Gale
81aa1f2c5c RM-6993 replace old assoc with new 2019-10-08 13:25:30 +01:00
Ross Gale
d50b552be6 RM-6928 adding check to allow specified properties on frozen nodes to be updated 2019-09-24 16:45:51 +01: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
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
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
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
Sara Aspery
18bd7d7fac MNT-20740 New db query 2019-08-22 11:19:34 +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
cagache
bee8d09bd4 Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 16:54:58 +03:00
Ross Gale
6437f31749 RM-6873 adding code review changes 2019-08-20 13:56:14 +01:00
cagache
d990f30e8c Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 08:09:32 +03:00
Ross Gale
ac4b8d4b9a RM-6873 adding changes from update branch and updating tests 2019-08-19 15:56:10 +01:00
cagache
3dfc01f716 Added check for Remove From Hold capability 2019-08-19 09:32:33 +03:00
cagache
221a633c2a Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-16 09:44:56 +03:00
Ross Gale
1d739008c2 RM-6873 adding unit tests for edit 2019-08-16 07:25:19 +01:00
cagache
f972c54efb Moved instanceOf method from ServiceBaseImpl class to a utility class 2019-08-14 17:04:04 +03:00
cagache
947b293c76 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
dff5b452d9 RM-6873 code review changes 2019-08-14 11:20:18 +01:00
cagache
c3021ccfa1 Do not allow addition of locked content to holds 2019-08-13 17:10:06 +03:00
cagache
8fc0ca7e5a Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-09 12:53:03 +03:00
cagache
2f88cee847 Add active content to hold through rest api 2019-08-09 12:07:24 +03:00