Commit Graph

33 Commits

Author SHA1 Message Date
Sara Aspery
9601805568 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +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
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Rodica Sutu
7ca293d815 update min version ACS version for the text context 2019-11-26 16:05:47 +02:00
rlucanu
33e4ac3ac2 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Ross Gale
375ca76ad0 RM-6702 updating headers to 2019 2019-01-04 15:25:11 +00:00
Ross Gale
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Sara Aspery
fd61966f06 RM-6354 Module repo version error 2018-06-13 10:28:36 +01:00
Rodica Sutu
d33720fa15 fix the wrong value for Search bean 2018-05-31 10:13:31 +03:00
Rodica Sutu
3ce7d7ffb8 review changes 2018-05-31 09:48:30 +03:00
Rodica Sutu
3fb155405e attempt to fix integration tests 2018-05-24 17:42:31 +03:00
Rodica Sutu
345b3e6332 fix integration tests 2018-05-23 12:36:24 +03:00
Rodica Sutu
ff1a8fa8ac update the RM schedulers from test context files 2018-05-14 17:42:17 +03:00
Rodica Sutu
5ba7d3328b Spring update - update of xsd declaration for the context files 2018-05-14 09:35:42 +03:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Ana Manolache
4a145de54e update headers to 2018 2018-01-03 12:01:00 +02:00
Tuna Aksoy
a80d4a523e Updated license headers 2017-01-01 11:52:56 +00:00
Tom Page
eacfd00e0c Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Roxana Lucanu-Ghetu
05d4c27439 Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster 2016-07-12 11:47:10 +03:00
Roy Wetherall
12b94dd396 Ensure that the test listeners are only loaded into the application context when the relevant test is executed. 2016-07-08 11:49:15 +10:00
Roxana Lucanu-Ghetu
771a13194b sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration 2016-07-05 11:54:19 +03:00
Roy Wetherall
850783b64a Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
1c7a84e481 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Tuna Aksoy
8fcc027af0 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
27c76455c8 RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
4191ba9495 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
Tuna Aksoy
d41d325ba1 RM-3132 (Update license headers) 2016-03-11 23:03:18 +00:00
Tuna Aksoy
5d1d814e13 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Roy Wetherall
f98f0cb32b Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
be365f98ba Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Tuna Aksoy
402fc1b831 RM-2940 (Create parent pom.xml file above rm-community and rm-enterprise) 2016-01-31 20:11:15 +00:00