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,124 Commits 324 Branches 2,170 Tags
4b7bbd7fbdedb51d5453d5eb5909bbe446563eb1
Commit Graph

245 Commits

Author SHA1 Message Date
Roxana Lucanu
6a65308383 Merge branch 'release/V3.0' into merge-3.1/RM-7065_RetentionScheduleInheritance 2020-01-28 09:50:28 +02:00
Roxana Lucanu
2ddd48d23d RM-7065 Merge branch 'release/V2.7' into merge-3.0/RM-7065_RetentionScheduleInheritance 2020-01-27 17:18:24 +02:00
Roxana Lucanu
5a645d39ed RM-7065 merge to v2.7 2020-01-27 11:12:48 +02:00
Roxana Lucanu
aaf18955be Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'" 
This reverts merge request !1353
 2020-01-27 08:43:09 +00:00
Roxana Lucanu
7b6db44df4 Merge branch 'release/v2.6' into merge-2.7/RM-7065_MNT-20822 2020-01-20 12:44:41 +02:00
Roxana Lucanu
490051aa21 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5' 
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
 2020-01-14 19:02:48 +02: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
Roxana Lucanu
7d4dc81cb3 Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect 2019-12-09 14:39:06 +02:00
Roxana Lucanu
d67218cbb1 Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
26cd72a416 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Roxana Lucanu
2afd579818 Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Roxana Lucanu
23300d09cd RM-7060 Fix integration tests 2019-11-27 11:28:32 +02: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
Roy Wetherall
4518cd8615 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10: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
7782d7d448 Removed redundant local variables 2019-07-01 16:45:32 +03:00
cagache
1d86dd1aa2 Removed redundant conditional expression 2019-07-01 16:34:24 +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
Claudia Agache
f70e3f92f1 RM-6746 cherry picking merge request from RM-6790 2019-06-20 15:13:03 +01:00
Ross Gale
12f9907b06 RM-6865 code review changes 2019-06-19 08:20:55 +01:00
Ross Gale
6eba79b77a RM-6865 adding test 2019-06-17 08:01:15 +01:00
Rodica Sutu
1e7e881a32 fix the previous commit revert the integration tests changes and add tests for RM-6780 Add "Declare and File Record" Share action 2019-05-23 15:47:00 +03:00
Rodica Sutu
420959effe Tests for RM-6780 Add "Declare and File Record" Share action 2019-05-23 15:43:13 +03:00
Sara Aspery
f2e5c9c6a8 RM-6792 Oliver strings and fix closed folder and tests 2019-05-10 15:26:17 +01:00
Sara Aspery
efc037a974 RM-6792 Optional Record Locn 2019-04-24 11:42:42 +01:00
Rodica Sutu
82842a9a5e Update to ACS 6.0.1.2 2019-04-19 15:13:59 +01:00
rlucanu
830874b334 RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
rlucanu
a0c4cd579c RM-6723 Added ActiveMQ 2019-04-05 14:44:30 +03:00
rlucanu
36ac3edc5d Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-02 12:21:14 +03:00
Rodica Sutu
1bb3a5681e fix getResourceAsStream() for OpenJdk11 2019-04-01 11:11:43 +03:00
rlucanu
33e4ac3ac2 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Rodica Sutu
a891f75568 fix compilation error 2019-03-28 09:44:43 +02: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
6a5c267170 addressed code review comments 2019-02-18 10:57:16 +02:00
cagache
9a72cc8e11 fixed failing tests 2019-02-14 16:22:57 +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
Ross Gale
1f2034b4fe RM-6702 Updating licence headers 2019-01-03 09:23:49 +00:00
Sara Aspery
fd61966f06 RM-6354 Module repo version error 2018-06-13 10:28:36 +01:00
cagache
82345db29a code review changes 2018-06-07 16:35:42 +03:00
cagache
a9bf1b91a5 RM-6364 Convert search integration tests to end to end tests done through api 2018-06-07 10:43:37 +03:00
Rodica Sutu
d33720fa15 fix the wrong value for Search bean 2018-05-31 10:13:31 +03:00