inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,183 Commits 330 Branches 2,178 Tags
aa09cf35a709beb0497e189da38e081a25e241d7
Commit Graph

338 Commits

Author SHA1 Message Date
rodicasutu
aa09cf35a7 Merge remote-tracking branch 'remotes/origin/release/V3.2' into release/V3.3 2021-01-04 10:40:29 +02:00
rodicasutu
3ff2f49d7b update headers year to 2021 (release/V3.2) 2021-01-04 10:31:26 +02:00
rodicasutu
70b4b927d2 Merge remote-tracking branch 'remotes/origin/release/V3.1' into release/V3.2 2021-01-04 10:17:48 +02:00
rodicasutu
cdc0f2d022 Merge remote-tracking branch 'remotes/origin/release/V3.0' into release/V3.1 2021-01-04 09:54:37 +02:00
rodicasutu
834cd2b13d update headers year to 2021 2021-01-04 09:44:44 +02:00
Claudia Agache
166d6a7afa Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7154UnitTests_no 2020-04-14 13:22:15 +03:00
Claudia Agache
4a8c5c337d 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
26a96c9645 Mock search language to afts 
(cherry picked from commit b8acf45b53)
 2020-04-14 09:22:00 +03:00
Claudia Agache
da063ffa3c Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit c7a55840

(cherry picked from commit 3e5d9d6ba3)
 2020-04-14 09:21:57 +03:00
Claudia Agache
b8acf45b53 Mock search language to afts 2020-04-13 15:31:23 +03:00
Claudia Agache
3e5d9d6ba3 Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit c7a55840
 2020-04-12 19:13:09 +03:00
Claudia Agache
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e 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
d222954e15 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
2f476bdb0d RM-7145 Unit tests for processing ResultSet with RMAfterInvocationProviderUnitTest. 2020-04-01 15:28:40 +01:00
Tom Page
e25afe95f5 Merge release/V3.2 into release/V3.3. 2020-03-04 08:19:06 +00:00
Tom Page
0aac29261b Merge release/V3.1 into release/V3.2. 2020-03-03 11:57:12 +00:00
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
Ramona Popa
0f7cc3b94c RM-7111: AGS 3.3 can't be installed on ACS 6.1 
- added alfresco.min.version to 6.1
 2020-02-05 12:28:31 +00:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Christopher Shields
b6c7a504c1 RM-7101: [Upgrade] Delete hold audit events are not properly migrated 2020-01-13 00:00:34 +00:00
Ramona Popa
a3574f7f2b RM-7098: [Upgrade] Add to Hold and Remove from hold audit events are not properly migrated 2020-01-10 09:23:06 +00: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
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
Rodica Sutu
10a047e4bb Merge branch 'feature/RM-7066_UpdateToACS62' into 'master' 
Resolve RM-7066 "Feature/ updatetoacs62"

Closes RM-7066

See merge request records-management/records-management!1314
 2019-12-05 08:33:56 +00:00
Sara Aspery
47670b03e0 RM-7064 Fix unit tests after review updates 2019-12-03 06:15:03 +00:00
Sara Aspery
9576d34f50 RM-7068 updates from review 2019-11-28 17:07:20 +00:00
Sara Aspery
5ef599bdca RM-7064 check permissions for delete node 2019-11-28 01:09:21 +00:00
Rodica Sutu
6b1e06f4aa replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Sara Aspery
056de88500 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-21 10:07:15 +00:00
Chris Shields
d8862b1ee3 Code review changes 2019-11-20 11:16:04 +00:00
Sara Aspery
c10c31310e Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-20 09:49:29 +00:00
Chris Shields
a8223fbae8 Code review changes 2019-11-19 21:11:50 +00:00
Chris Shields
22a1c93c83 RM-7029 Audit remove from hold 2019-11-19 12:05:06 +00:00
Sara Aspery
d31be34bff Merge branch 'master' into feature/RM-7028_Add_Add_To_Hold_ToAudit 2019-11-18 14:12:23 +00:00
Sara Aspery
0137495c1d RM-6930 review updates 2019-11-18 10:47:09 +00:00
Ramona Popa
ed1c2b1b4a RM-7057: Delete hold event isn't audited if hold is deleted using nodes api 
-listen to beforeDeleteNode policy rather than beforeDeleteHold one to cover the delete the hold from api as well
 2019-11-18 08:34:54 +00:00
Sara Aspery
fcaed6d3b7 RM-6930 review updates 2019-11-18 01:25:34 +00:00
Sara Aspery
5f04257c56 RM-7028 fix unit test 2019-11-12 12:11:34 +00:00
Sara Aspery
ac96b7065c Merge branch 'feature/RM-7027_Add_Hold_Deleted_ToAudit' into 'master' 
Resolve RM-7027 "Feature/ add hold deleted to audit"

Closes RM-7027

See merge request records-management/records-management!1295
 2019-11-07 22:53:56 +00:00