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
7,800 Commits 324 Branches 2,170 Tags
a27e2aaa9ebb62c65342a5f0c9d47dbf05760b17
Commit Graph

1144 Commits

Author SHA1 Message Date
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
Ross Gale
3937379587 RM-7051 resolving conflict 2019-11-25 08:31:09 +00:00
Ross Gale
ffaf55c7d3 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
df6d92d031 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
Sara Aspery
c6302fd034 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-21 10:07:15 +00:00
Sara Aspery
6cec2bb099 Merge branch 'master' into feature/RM-6930_DeleteHold 2019-11-20 09:49:29 +00:00
Chris Shields
bc5c5bd51d Code review changes 2019-11-19 21:11:50 +00:00
Chris Shields
4a89c38f2d Merge branch 'feature/RM-7028_Add_Add_To_Hold_ToAudit' into feature/RM-7029_RemoveFromHold 2019-11-19 12:14:04 +00:00
Chris Shields
ad963bb24e RM-7029 Audit remove from hold 2019-11-19 12:05:06 +00:00
Sara Aspery
8140859d03 RM-7028 review updates 2019-11-19 11:15:45 +00:00
Sara Aspery
30e3ea689f RM-7028 review updates 2019-11-18 15:59:54 +00:00
Sara Aspery
e9be5a4188 Merge branch 'master' into feature/RM-7028_Add_Add_To_Hold_ToAudit 2019-11-18 14:12:23 +00:00
Sara Aspery
7fbf695a32 RM-6930 another review update, correct typo in existing message 2019-11-18 14:07:55 +00:00
Sara Aspery
9ff5d66024 RM-6930 review updates 2019-11-18 10:56:45 +00:00
Ramona Popa
c386f1bbd8 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
b2ae5242e9 RM-6930 review updates 2019-11-18 01:25:34 +00:00
Sara Aspery
d4c9be9f11 RM-7028 integ test fix, locn refactor, multi files fix 2019-11-16 14:11:06 +00:00
Roxana Lucanu
1278258a74 RM-7054 code review changes 2019-11-12 10:36:42 +02:00
Sara Aspery
55e5267234 RM-7028 show location and fix multiple holds 2019-11-12 05:13:40 +00:00
Roxana Lucanu
65f30701d1 RM-7054 Changes on held content policies 2019-11-08 14:33:43 +02:00
Sara Aspery
59253c84ae 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
Sara Aspery
9ad116e1c5 Merge branch 'feature/RM-7026_Add_HoldCreated_ToAudit' into 'master' 
Resolve RM-7026 "Feature/ add holdcreated toaudit"

Closes RM-7026

See merge request records-management/records-management!1283
 2019-11-07 12:23:21 +00:00
Sara Aspery
e0d96d3219 Merge branch 'master' into feature/RM-6930_DeleteHold 
# Conflicts:
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
 2019-11-06 23:35:27 +00:00
Sara Aspery
606f599059 RM-7028 Audit add to hold 2019-11-06 23:20:28 +00:00
Sara Aspery
a890ad5274 RM-7027 Audit delete hold 2019-11-06 16:33:38 +00:00
Sara Aspery
ece61ee5f1 RM-7026 Updated hold name display property 2019-11-06 16:00:53 +00:00
Sara Aspery
c86a6a8f78 Merge branch 'master' into feature/RM-7026_Add_HoldCreated_ToAudit 2019-11-06 12:22:36 +00:00
Rodica Sutu
02bdf0d92a update java docs & fix sonar "Mutable members should not be stored or returned directly" from PropertyModificationAllowedCheck class 2019-11-05 16:43:57 +02:00
Rodica Sutu
9e62b9a858 code reviews changes and couple sonar fixes 2019-11-05 11:43:32 +02:00
Rodica Sutu
77f607ed95 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7020_AllowUpdateOfPropertiesForSystemNamespaceURIRefactor 2019-11-05 11:37:56 +02:00
Roxana Lucanu
bf860c8944 RM-7034 style changes 2019-11-05 10:32:16 +02:00
Rodica Sutu
f54ab26b88 fix the case when before and after values are null 2019-11-04 17:42:25 +02:00
Rodica Sutu
9bbb0b3516 refactor the code to fix the sonar issue "Refactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed." 2019-11-04 17:24:09 +02:00
Roxana Lucanu
04a190459a RM-7034 Fixed unit tests and split class for add/remove from hold tests. 2019-11-04 16:40:18 +02:00