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,006 Commits 324 Branches 2,170 Tags
187db478a5df6633b67012e0aa6299c465c5af5a
Commit Graph

975 Commits

Author SHA1 Message Date
Sara Aspery
187db478a5 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
e1da6ab294 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
f7e69629bb Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
03eee1b8e3 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8 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
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 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
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
Sara Aspery
ff5f8f8d68 RM-7062 fix for failing tests 2019-12-20 02:20:13 +00:00
Sara Aspery
46918e41eb RM-7062 add noderef to audit entry for hold 2019-12-19 22:46:07 +00:00
Sara Aspery
5b68c47866 RM-7062 fix integration tests 2019-12-17 08:37:15 +00:00
Sara Aspery
f1b7fe5b2c Merge branch 'master' into feature/RM-7062_NoReadOnHoldCanSeeAuditEvent 2019-12-15 08:46:11 +00:00
Sara Aspery
bf0153f02b RM-7062 Updates from review 2019-12-15 07:17:59 +00:00
Claudia Agache
d5fbdac23c 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
842f586d1f RM-7062 Unit tests 2019-12-13 07:21:35 +00:00
cagache
41e41902c0 RM-7093 Update item location to include the provenience site 2019-12-11 16:16:49 +02:00
Roxana Lucanu
50df5ac0a2 Merge remote-tracking branch 'origin/master' into merge/RM-7060_FixSearchAspect 2019-12-10 16:09:03 +02:00
Roxana Lucanu
91d80e006c Merge branch 'release/V3.2' into merge/RM-7060_FixSearchAspect 2019-12-10 14:33:19 +02:00
Ross Gale
149314d068 RM-7051 replacing string utils ref 2019-12-10 10:41:12 +00:00
Roxana Lucanu
91261ef300 Merge branch 'release/V3.1' into merge-3.2/RM-7060_FixSearchAspect 2019-12-10 09:09:56 +02:00
Roxana Lucanu
d0cb729f35 Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect 2019-12-09 14:39:06 +02:00
Roxana Lucanu
45e39aa4bd Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Ross Gale
7af0b3f7f6 Merge remote-tracking branch 'origin/release/V3.2' into merge/RM-7051 2019-12-05 15:35:01 +00:00
Ramona Popa
fa8104cdc2 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
ace2728b16 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
8a67a6286d 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
050ab580ee RM-7062 Check hold permission for view audit event 2019-12-05 05:11:53 +00:00
Ross Gale
3809249576 RM-7051 updating code to deal with held content after 3.2 change 2019-12-04 14:01:54 +00:00
Roxana Lucanu
6035370684 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02:00
Sara Aspery
4bf23c1d6a 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
8d5ff56f8f Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Sara Aspery
4b4323dd58 RM-7064 Fix unit tests after review updates 2019-12-03 06:15:03 +00:00
Ross Gale
94cb6346ce Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/mergeUp 2019-12-02 08:08:06 +00:00
Ross Gale
6b01d76ed1 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Rodica Sutu
9d17f70cd3 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
3505e8dfd6 fix conflicts 2019-11-29 10:59:47 +00:00
Sara Aspery
fb6ca169a0 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
976748ee0f RM-7068 updates from review 2019-11-28 17:07:20 +00:00
Sara Aspery
b9d923d0d0 RM-7070 updates from review 2019-11-28 16:48:21 +00:00
Rodica Sutu
044c571df5 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
26ed36d312 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
3c1df3c25a RM-7070 Show role in audit for active content 2019-11-28 03:54:07 +00:00
Sara Aspery
a0868776d5 RM-7068 updates from review 2019-11-28 01:45:40 +00:00
Sara Aspery
fe502aadec RM-7064 check permissions for delete node 2019-11-28 01:09:21 +00:00
Sara Aspery
3c95f9c4f8 RM-7068 remove unused import statement 2019-11-27 05:58:00 +00:00
Sara Aspery
e8f67c8b75 RM-7068 restrict items in delete hold error msg 2019-11-27 05:55:29 +00:00
Roxana Lucanu
a7f2dec355 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Rodica Sutu
5ccea06272 replace the org.apache.commons.lang references to org.apache.commons.lang3 2019-11-26 09:11:08 +02:00
Ramona Popa
58280bc323 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