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
6,173 Commits 330 Branches 2,178 Tags
daa8e97684d541e19b9c47909c9cd9496b8b51f1
Commit Graph

1024 Commits

Author SHA1 Message Date
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
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
Sara Aspery
2c3a3e3726 RM-7062 fix integration tests 2019-12-17 08:37:15 +00:00
Sara Aspery
422ecf403a Merge branch 'master' into feature/RM-7062_NoReadOnHoldCanSeeAuditEvent 2019-12-15 08:46:11 +00:00
Sara Aspery
f4dce089df RM-7062 Updates from review 2019-12-15 07:17:59 +00:00
Claudia Agache
050ad46b00 Merge branch 'feature/RM-7093_UpdateItemLocation' into 'master' 
RM-7093 Update item location to include the provenience site

Closes RM-7093

See merge request records-management/records-management!1335
 2019-12-13 09:32:14 +00:00
Sara Aspery
740e9fda42 RM-7062 Unit tests 2019-12-13 07:21:35 +00:00
cagache
6c1015e9c9 RM-7093 Update item location to include the provenience site 2019-12-11 16:16:49 +02:00
Roxana Lucanu
463470b874 Merge remote-tracking branch 'origin/master' into merge/RM-7060_FixSearchAspect 2019-12-10 16:09:03 +02:00
Roxana Lucanu
9a048fca1c Merge branch 'release/V3.2' into merge/RM-7060_FixSearchAspect 2019-12-10 14:33:19 +02:00
Ross Gale
a265ca5409 RM-7051 replacing string utils ref 2019-12-10 10:41:12 +00:00
Roxana Lucanu
3c13cba8b5 Merge branch 'release/V3.1' into merge-3.2/RM-7060_FixSearchAspect 2019-12-10 09:09:56 +02: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
Ross Gale
3abb2d2c18 Merge remote-tracking branch 'origin/release/V3.2' into merge/RM-7051 2019-12-05 15:35:01 +00:00
Ramona Popa
0a27d49a7d RM-7092: Broken link for Add to / Remove from user group events 
- removed link in audit list for user groups events
 2019-12-05 13:07:21 +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
Ramona Popa
4fd3f7356e RM-7069: Display of the location is not consistent in all audit reports 
- made display of location and timestamp consistent
 2019-12-05 07:34:25 +00:00
Sara Aspery
5d129ce43a RM-7062 Check hold permission for view audit event 2019-12-05 05:11:53 +00:00
Ross Gale
4de8b50e4d RM-7051 updating code to deal with held content after 3.2 change 2019-12-04 14:01:54 +00:00
Roxana Lucanu
26cd72a416 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Sara Aspery
6b5033b767 Merge branch 'feature/RM-7064_FixPermissionsForDeleteHoldsNodeAPI' into 'master' 
RM-7064 check permissions for delete node

Closes RM-7064

See merge request records-management/records-management!1316
 2019-12-03 15:15:47 +00:00
Roxana Lucanu
2afd579818 Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Sara Aspery
47670b03e0 RM-7064 Fix unit tests after review updates 2019-12-03 06:15:03 +00:00
Ross Gale
f42cd05af3 Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/mergeUp 2019-12-02 08:08:06 +00:00
Ross Gale
f5ddb592a0 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Rodica Sutu
03744a6146 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7066_UpdateToACS62 2019-11-29 14:55:08 +02:00
Ross Gale
d0487f17d7 fix conflicts 2019-11-29 10:59:47 +00:00
Sara Aspery
1aa7ce560a Merge branch 'feature/RM-7070_ShowRoleForActiveContentInAudit' into 'master' 
RM-7070 Show role in audit for active content

Closes RM-7070

See merge request records-management/records-management!1317
 2019-11-29 02:50:59 +00:00
Sara Aspery
9576d34f50 RM-7068 updates from review 2019-11-28 17:07:20 +00:00
Sara Aspery
5af61a33e7 RM-7070 updates from review 2019-11-28 16:48:21 +00:00
Rodica Sutu
1f2f7000e8 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7066_UpdateToACS62 2019-11-28 16:33:07 +02:00
Ramona Popa
e0ab745b9e RM-7063: User with no Read on active content can see Add To Hold/Remove From Hold audit entries 
- filter entries based on READ permissions too
 2019-11-28 11:04:15 +00:00
Sara Aspery
c70277c197 RM-7070 Show role in audit for active content 2019-11-28 03:54:07 +00:00
Sara Aspery
3d3037b4b1 RM-7068 updates from review 2019-11-28 01:45:40 +00:00
Sara Aspery
5ef599bdca RM-7064 check permissions for delete node 2019-11-28 01:09:21 +00:00
Sara Aspery
2421c46f3c RM-7068 remove unused import statement 2019-11-27 05:58:00 +00:00
Sara Aspery
fe2112a81d RM-7068 restrict items in delete hold error msg 2019-11-27 05:55:29 +00:00
Roxana Lucanu
2b7541b501 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Rodica Sutu
6b1e06f4aa replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Ramona Popa
f3439fd917 RM-7047: Link to held item from audit entry 
- added support for link to held items in audit
   - changed style class for existing links in audit entry
 2019-11-26 07:00:28 +00:00
Ross Gale
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
5d3efcc4c4 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
Ross Gale
92c8c2db21 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 14:25:27 +00:00