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,669 Commits 324 Branches 2,170 Tags
51f4afbc1bf24d0590467a0cca437c008dd014c3
Commit Graph

248 Commits

Author SHA1 Message Date
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
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
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
Sara Aspery
e5bb53b686 MNT-20740 Updates from review 2019-08-05 10:20:38 +01:00
Sara Aspery
640ddc95f9 MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00
cagache
cc17d2f61e 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
d645c19e37 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
3dc65aaed5 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
3e31a5f85d RM-6869 code comment changes 2019-06-05 09:07:35 +01:00
Ross Gale
d06ac5abc5 RM-6869 removing linked record during rejection 2019-06-03 11:10:16 +01:00
Sara Aspery
5e2200a402 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
7abe56ec1e RM-6851 updates from review 2019-05-23 15:17:04 +01:00
Sara Aspery
ace859a087 RM-6852 Fix inconsistencies in V1 response codes 2019-05-23 12:44:20 +01:00
Sara Aspery
12ad79c3de RM-6851 Fix declare record into hold - add unit test 2019-05-23 12:32:01 +01:00
cagache
b8695771a7 code review comments 2019-05-22 17:04:18 +03:00
cagache
f22f772b29 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
6aa99b03bb RM-6792 review - change unfiled folder to container 2019-05-21 12:39:46 +01:00
cagache
4455c0b50a Updated javadoc 2019-05-21 12:10:45 +03:00
cagache
189f250ec7 Added check for filling permission on destination record folder 2019-05-20 17:02:05 +03:00
Sara Aspery
e4ffc81ed4 RM-6792 updates from review 1 2019-05-16 10:44:29 +01:00
Sara Aspery
efc037a974 RM-6792 Optional Record Locn 2019-04-24 11:42:42 +01:00
Rodica Sutu
4934fa5634 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
c9d1453025 RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
Ross Gale
0c2833a5a2 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
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Ross Gale
8d97d12f88 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
Rodica Sutu
eafe3ebf30 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
475164672e 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
33570a80da addressed code review comments 2019-02-19 09:37:36 +02:00
cagache
adbed03427 addressed code review comments 2019-02-18 17:08:05 +02:00
cagache
dfb473eef6 added unit tests 2019-02-18 15:16:48 +02:00
Ross Gale
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Sara Aspery
f6f33492db Merge branch 'xperimental/RM6353_FixYamlUnitTest_no' into 'xperimental/RM-6313UpgradeRMSchedulers' 
RM-6353 Fix Yaml Unit Test

See merge request records-management/records-management!1015
 2018-05-29 11:38:58 +01:00
Rodica Sutu
1ed99b5cf4 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00
Sara Aspery
2a275f3984 RM-6353 Fix Yaml Unit Test 2018-05-28 19:32:24 +01:00
Rodica Sutu
9f44f7b467 comment the check from BaseYamlUnitTest.java until we fix RM-6353 2018-05-23 11:51:27 +03:00
Ross Gale
e9d42bfeef search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
e11bef00bb Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00