rodicasutu
f23cbfc0e6
Merge remote-tracking branch 'remotes/origin/release/V3.0' into release/V3.1
2021-01-04 09:54:37 +02:00
rodicasutu
0f4a81a763
update headers year to 2021
2021-01-04 09:44:44 +02: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 2aafa4630e0bb6137c
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
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
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
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
Sara Aspery
0f0b0962b8
MNT-20740 Updates from review
2019-08-05 10:20:38 +01:00
Sara Aspery
7c4d8e91ab
MNT-20740 BinDuplicationHotFixSqlRefactor
2019-07-30 16:35:48 +01:00
cagache
cd76665548
Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6892_SonarFixes
2019-07-04 09:47:50 +03:00
cagache
da33dc1ae1
Removed unnecessary semicolon
2019-07-01 16:19:52 +03:00
cagache
6bc4ec03a6
Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>")
2019-07-01 16:01:43 +03:00
Ross Gale
62b7426b73
RM-6869 code comment changes
2019-06-05 09:07:35 +01:00
Ross Gale
76c865e41a
RM-6869 removing linked record during rejection
2019-06-03 11:10:16 +01:00
Sara Aspery
e0e2e94b21
Merge branch 'feature/RM-6852_FixInconsistenciesV1ResponeCodes' into 'feature/RM-6851_DeclareAndFileRecInHoldFolder'
...
Resolve RM-6852 "Feature/ fixinconsistenciesv1responsecodes"
See merge request records-management/records-management!1179
2019-05-23 21:24:40 +01:00
Sara Aspery
dc2e6f9f57
RM-6851 updates from review
2019-05-23 15:17:04 +01:00
Sara Aspery
48469d8ce9
RM-6852 Fix inconsistencies in V1 response codes
2019-05-23 12:44:20 +01:00
Sara Aspery
16ef2130a8
RM-6851 Fix declare record into hold - add unit test
2019-05-23 12:32:01 +01:00
cagache
021804e79a
code review comments
2019-05-22 17:04:18 +03:00
cagache
c1470c7c38
Merge remote-tracking branch 'remotes/origin/feature/RM-6796_DeclareAndFileTests' into feature/RM-6849_CheckForFilingPermission
2019-05-21 16:55:51 +03:00
Sara Aspery
8aeaf91926
RM-6792 review - change unfiled folder to container
2019-05-21 12:39:46 +01:00
cagache
c47cd6f44e
Updated javadoc
2019-05-21 12:10:45 +03:00
cagache
2bb72a4a59
Added check for filling permission on destination record folder
2019-05-20 17:02:05 +03:00
Sara Aspery
a2103168d8
RM-6792 updates from review 1
2019-05-16 10:44:29 +01:00
Sara Aspery
2c30614e8c
RM-6792 Optional Record Locn
2019-04-24 11:42:42 +01:00
Rodica Sutu
bb93c0ad4e
Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies
...
# Conflicts:
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
2019-04-09 10:51:44 +03:00
Ross Gale
c551042eca
RM-6787 adding fix for renditons
2019-04-05 15:50:33 +01:00
Ross Gale
9baac01d03
RM-6787 updating copy and add behaviors for other aspects to use duplication utility class
2019-04-02 11:47:29 +01:00
Ross Gale
ed8f24865c
RM-6787 adding fix for version number increasing and bin duplicating more than needed
2019-04-01 17:54:23 +01:00
Ross Gale
8bf3cdf913
RM-6788 adding change to 3.0.1 branch
2019-03-13 12:04:10 +00:00
Rodica Sutu
c96f9ae280
Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6
2019-02-25 16:03:08 +02:00
Rodica Sutu
cc3f72cfaf
Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6
2019-02-25 09:19:23 +02:00
cagache
fb02ac0afa
addressed code review comments
2019-02-19 09:37:36 +02:00
cagache
db47a2f6f2
addressed code review comments
2019-02-18 17:08:05 +02:00
