Commit Graph

6269 Commits

Author SHA1 Message Date
gbroadbent
3c5274e655 FRENCH: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:18:02 +00:00
gbroadbent
b445a0d533 SPANISH: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:17:37 +00:00
gbroadbent
1b1b1d8cb7 GERMAN: Updated files for AGS 3.3 based on EN version of 2020-01-03_master branch. Partial fix for https://issues.alfresco.com/jira/browse/LOC-185 2020-01-09 10:16:58 +00:00
Roxana Lucanu
f06f2df8b1 RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
862c19df35 RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
f30cca289d RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
75bc33640e MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Roxana Lucanu
313a0fe5bf Merge branch 'feature-2.5/UpdateLicenseHeader' into 'release/V2.5'
update license header

See merge request records-management/records-management!1341
2020-01-06 16:12:25 +00:00
Ross Gale
2dd9015ad8 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
99185e264f Merge branch 'feature-2.6/MNT-20822_UpdatingHeaders' into 'release/V2.6.0.x'
Updating headers

See merge request records-management/records-management!1342
2020-01-06 11:56:11 +00:00
Ross Gale
57e464b47f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
392ea281b1 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
dcc20cbfb4 Update license headers 2020-01-03 10:53:19 +00:00
Sara Aspery
9601805568 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
f90586ce32 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
16b6678fd3 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
92f4843a24 Update license headers 2020-01-02 18:27:23 +00:00
Sara Aspery
fb014ba5dc Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
5865482fe6 Update license headers 2020-01-02 16:20:24 +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
Sara Aspery
16151d8d76 Merge branch 'feature/RM-7062_NoReadOnHoldCanSeeAuditEvent' into 'master'
RM-7062 Check hold permission for view audit event

Closes RM-7062

See merge request records-management/records-management!1324
2019-12-20 19:10:12 +00:00
Claudia Agache
dd74f6298c Merge branch 'feature/RM-7081_ReduceAutomationProjSonarIssues' into 'master'
RM-7081 Reduce automation proj sonar issues

Closes RM-7081

See merge request records-management/records-management!1337
2019-12-20 14:49:19 +00:00
cagache
bb2162fd72 Remove mvn clean 2019-12-20 14:38:44 +02:00
cagache
218239a1a6 Revert "Added install_first source clear scan directive"
This reverts commit 7156ad9c
2019-12-20 14:37:51 +02:00
cagache
1c090aef73 Revert "Added back fail-fast"
This reverts commit e76d3c54
2019-12-20 14:37:32 +02:00
cagache
e76d3c5457 Added back fail-fast 2019-12-20 14:25:20 +02:00
cagache
7156ad9c75 Added install_first source clear scan directive 2019-12-20 11:40:49 +02:00
cagache
f61791c0a4 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7081_ReduceAutomationProjSonarIssues 2019-12-20 10:38:08 +02:00
cagache
a9e20f89bb Upgrade jackson-databind from 2.9.10 to 2.9.10.1 2019-12-20 09:50:58 +02:00
Sara Aspery
b35dcb14a3 RM-7062 fix for failing tests 2019-12-20 02:20:13 +00:00
Sara Aspery
105da8eecf RM-7062 add noderef to audit entry for hold 2019-12-19 22:46:07 +00:00
Roxana Lucanu
d558f614ba Merge branch 'feature/RM_7096_VeracodeScanExcludeAutomation_no' into 'master'
RM-7096 Source clear scan exclude automation project

See merge request records-management/records-management!1338
2019-12-19 15:14:39 +00:00
cagache
54f138c96e Added comment 2019-12-19 17:00:42 +02:00
cagache
57e8e65dc2 Don't fail fast 2019-12-19 16:20:37 +02:00
cagache
e870bbb5ae Exclude benchmark project from source clear scan using a custom maven command 2019-12-19 15:19:12 +02:00
cagache
84ce8240d0 Try to exclude automation project from source clear scan using a custom maven command 2019-12-19 13:56:53 +02:00
cagache
d71d416521 Try to exclude automation project from sourceclear scan using a custom maven command 2019-12-19 12:46:16 +02:00
cagache
60be584154 Try to exclude automation project from sourceclear scan using a custom maven command 2019-12-19 12:08:20 +02:00
cagache
82eb477dc8 Try to exclude automation project from sourceclear scan using a custom maven command 2019-12-19 11:20:26 +02:00
cagache
9a82186e7a Try to exclude automation project from sourceclear scan using a custom maven command 2019-12-19 10:42:34 +02:00
cagache
ac4f4bd551 Exclude automation project from sourceclear scan 2019-12-19 10:25:52 +02:00
cagache
02258c5d92 Exclude automation project from sourceclear scan 2019-12-19 10:20:49 +02:00
cagache
393e74c5c4 Exclude automation project from sourceclear scan 2019-12-19 09:42:50 +02:00
Sara Aspery
2c3a3e3726 RM-7062 fix integration tests 2019-12-17 08:37:15 +00:00
cagache
be75ea973f Reduce Sonar issues from automation-community-rest-api 2019-12-16 15:14:31 +02:00
Sara Aspery
422ecf403a Merge branch 'master' into feature/RM-7062_NoReadOnHoldCanSeeAuditEvent 2019-12-15 08:46:11 +00:00
Sara Aspery
0e743a8b31 RM-7062 Fix automation tests 2019-12-15 07:18:33 +00:00