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,269 Commits 330 Branches 2,178 Tags
06de12a10cdee972aef9f7ad4ea5cd5e10c752cc
Commit Graph

6269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claudia Agache
d627723551 Merge branch 'feature/RM-7060_TestsForRecordSearchAspect_no' into 'master' 
RM-7060 Tests for recordsearch aspect

Closes RM-7060

See merge request records-management/records-management!1334
 2019-12-13 07:11:23 +00:00
cagache
3f6487571d review comments 2019-12-12 12:06:49 +02:00
cagache
0484593d00 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-7060_TestsForRecordSearchAspect_no 2019-12-12 11:41:25 +02:00
Claudia Agache
271abbfdc3 Merge branch 'merge/RM-7060_FixSearchAspect' into 'master' 
Resolve RM-7060 "Merge/ fixsearchaspect"

Closes RM-7060 and RM-7051

See merge request records-management/records-management!1333
 2019-12-12 09:35:20 +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
Ross Gale
a5fd2dc218 Merge branch 'merge/RM-7051_disposition' into 'master' 
Resolve RM-7051 "Merge/ disposition"

Closes RM-7051

See merge request records-management/records-management!1328
 2019-12-10 13:22:21 +00:00
Roxana Lucanu
9a048fca1c Merge branch 'release/V3.2' into merge/RM-7060_FixSearchAspect 2019-12-10 14:33:19 +02:00
Roxana Lucanu
8a41dc1d68 Merge branch 'merge-3.2/RM-7060_FixSearchAspect' into 'release/V3.2' 
Resolve RM-7060 "Merge 3.2/ fixsearchaspect"

See merge request records-management/records-management!1332
 2019-12-10 12:17:15 +00:00
Ross Gale
a265ca5409 RM-7051 replacing string utils ref 2019-12-10 10:41:12 +00:00
cagache
530db41df9 Check rma:recordSearch aspect is still present after record move 2019-12-10 10:58:10 +02: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
4be6336e45 Merge branch 'merge-3.1/RM-7060_FixSearchAspect' into 'release/V3.1' 
Resolve RM-7060 "Merge 3.1/ fixsearchaspect"

See merge request records-management/records-management!1331
 2019-12-10 07:04:45 +00:00
cagache
e9b8fdd52e Check rma:recordSearch aspect is still present after records filing 2019-12-09 16:57:31 +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
ba18adff55 Merge branch 'merge-3.0/RM-7060_FixSearchAspect' into 'release/V3.0' 
Resolve RM-7060 "Merge 3.0/ fixsearchaspect"

See merge request records-management/records-management!1330
 2019-12-09 12:36:21 +00:00
Roxana Lucanu
d67218cbb1 Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:49:30 +02:00
Roxana Lucanu
85f125bdaf Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect 2019-12-09 10:44:26 +02:00
Roxana Lucanu
31eeaf187e Merge branch 'merge-2.7/RM-7060_FixSearchAspect' into 'release/V2.7' 
Resolve RM-7060 "Merge 2.7/ fixsearchaspect"

See merge request records-management/records-management!1329
 2019-12-09 08:24:51 +00: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
588e88be88 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
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
Ross Gale
de8a12e3f5 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
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
c4a99ab7c0 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
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
Roxana Lucanu
0143e1989e 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
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
Rodica Sutu
6f3bf7adb9 changes to address code review comments 2019-12-02 15:52:31 +02:00
Rodica Sutu
ddd9c5f360 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
f42cd05af3 Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/mergeUp 2019-12-02 08:08:06 +00:00
Ross Gale
05e3238d1d 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
f5ddb592a0 Merge branch 'release/V3.0' into merge-3.1/mergeUp 2019-11-29 15:55:07 +00:00
Ross Gale
4f65d24c02 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
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
b53f460398 Record only merge of version change. 2019-11-29 12:12:07 +00: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
Rodica Sutu
2af88d9683 fix testFillingPermissionOnSourceAndTarget 2019-11-28 16:15:52 +02:00