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

6147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
56b82d8380 Merge branch 'feature/RM-7092_BrokenLinkForUserGroupEvents' into 'master' 
RM-7092: Broken link for Add to / Remove from user group events

Closes RM-7092

See merge request records-management/records-management!1327
 2019-12-05 13:07:21 +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
Ross Gale
ebf8a906a1 Merge branch 'merge-3.2/RM-7051_DispositionWebScript' into 'release/V3.2' 
Resolve RM-7051 "Merge 3.2/ dispositionwebscript"

See merge request records-management/records-management!1323
 2019-12-05 12:42:59 +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
1672dd00d4 Merge branch 'feature/RM-7069_InconsistencyInDisplayingLocationAndTimestamp' into 'master' 
RM-7069: Display of the location is not consistent in all audit reports

Closes RM-7069

See merge request records-management/records-management!1322
 2019-12-05 07:34:25 +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
Roxana Lucanu
ac12711512 Merge branch 'merge-2.6/RM-7060_FixSearchAspect' into 'release/V2.6' 
Resolve RM-7060 "Merge 2.6/ fixsearchaspect"

See merge request records-management/records-management!1321
 2019-12-04 13:40:22 +00: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
Rodica Sutu
2629b65eb1 changes to address code review comments 2019-12-02 15:52:31 +02:00
Rodica Sutu
3885c4462c remove the content property as ContentPropertyRestrictionInterceptor will not allow update of content via nodeService.addProperties 2019-12-02 10:50:35 +02: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
77799d1632 Merge branch 'merge-3.1/mergeUp' into 'release/V3.1' 
Merge 3.1/merge up

See merge request records-management/records-management!1320
 2019-12-02 07:58:27 +00:00
Ross Gale
6b01d76ed1 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
d74cbe52b6 Merge branch 'merge-3.0/mergeUp' into 'release/V3.0' 
Merge 3.0/merge up

See merge request records-management/records-management!1319
 2019-11-29 15:52:19 +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
7048f30e89 Record only merge of version change. 2019-11-29 12:12:07 +00: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
Rodica Sutu
843782712e fix testFillingPermissionOnSourceAndTarget 2019-11-28 16:15:52 +02:00
Roxana Lucanu
89cc90cef7 Merge branch 'feature-2.5/RM-7060_FixSearchAspect' into 'release/V2.5' 
RM-7060 Reapply search aspect when filing/moving

See merge request records-management/records-management!1315
 2019-11-28 13:22:55 +00:00
Ramona Popa
6249537356 Merge branch 'feature/RM-7063_UserWithNoReadCanSeeAudit' into 'master' 
RM-7063: User with no Read on active content can see Add To Hold/Remove From Hold audit entries

Closes RM-7063

See merge request records-management/records-management!1312
 2019-11-28 11:04:15 +00: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
81ab6da25d Merge branch 'feature/RM-7068_ShortenErrorMsgForDeleteHold' into 'master' 
Resolve RM-7068 "Feature/ shorten error msg for delete hold"

Closes RM-7068

See merge request records-management/records-management!1313
 2019-11-28 06:55:02 +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
Rodica Sutu
27a6a433c9 changes for ACS 6.2.0.ga 2019-11-27 15:23:28 +02:00
Roxana Lucanu
f138d31436 RM-7060 Fix integration tests 2019-11-27 11:28:32 +02: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
78d2570d3d update min version ACS version for the text context 2019-11-26 16:05:47 +02:00
Ross Gale
3c2a6f269c Merge branch 'merge-2.7/RM-7051_RecordOnly' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ recordonly"

See merge request records-management/records-management!1311
 2019-11-26 13:24:29 +00:00
Ross Gale
850dd8fc15 Record only merge of version change. 2019-11-26 11:36:53 +00:00
Ross Gale
78bec90215 Merge branch 'merge-2.6/RM-7051_RecordOnly' into 'release/V2.6' 
Resolve RM-7051 "Merge 2.6/ recordonly"

See merge request records-management/records-management!1310
 2019-11-26 11:28:38 +00:00
Ross Gale
cb5e060731 Record only merge of version change. 2019-11-26 11:22:35 +00:00
Ross Gale
c9f73f70bc Merge branch 'merge-2.5/RM-7051_RecordOnly' into 'release/V2.5' 
Resolve RM-7051 "Merge 2.5/ recordonly"

See merge request records-management/records-management!1309
 2019-11-26 11:16:17 +00:00
Ross Gale
8c721c710c Record only merge of version change. 2019-11-26 10:38:34 +00:00
Ross Gale
9d3dae0666 Merge branch 'merge-2.7/RM-7051_MergeUp' into 'release/V2.7' 
Resolve RM-7051 "Merge 2.7/ mergeup"

See merge request records-management/records-management!1308
 2019-11-26 08:43:17 +00:00
Rodica Sutu
6a7e346e22 replace the ARGs parameter from Dockerfile 2019-11-26 10:18:29 +02:00
Rodica Sutu
c7e920053e update the docker dependencies on community to ACS 6.2.0.ea 2019-11-26 09:27:49 +02:00