Commit Graph

677 Commits

Author SHA1 Message Date
Ross Gale
a0575dbc8a RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
cagache
6e54380abf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
2018-10-02 14:51:13 +03:00
cagache
47d3f91abc MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
Rodica Sutu
df19e3749e Merge origin/release/V2.6' into merge-2-7/MNT-19080_RM-6504_MergeFrom2.6
* remotes/origin/release/V2.6:
  fixed tests because exception changed
  use fileFolderService instead of contentService
  MNT-18806 create a new content URL for the copy only if it has content
  MNT-18806 create a new content bin for the copy on copy complete behavior
  MNT-18806 Add REST test for deleting copy of record.
  MNT-18806 Remove some raw Exceptions from REST test framework.
2018-08-27 20:01:26 +03:00
cagache
ea40d03c80 use fileFolderService instead of contentService 2018-08-24 17:26:25 +03:00
cagache
d764fef7a5 MNT-18806 create a new content URL for the copy only if it has content 2018-08-24 16:25:20 +03:00
cagache
6691a4966c Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp 2018-08-24 13:33:59 +03:00
cagache
770ee1047b MNT-18806 create a new content bin for the copy on copy complete behavior 2018-08-24 13:25:45 +03:00
Rodica Sutu
caa79346e6 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +03:00
Claudia Agache
3eb7f62f27 Merge branch 'feature-2.6/RM-6504_ChangeACSVersion' into 'release/V2.6'
RM-6504 Changed ACS version

See merge request records-management/records-management!1098
2018-08-21 14:17:20 +01:00
Rodica Sutu
df280e176d update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
b7f2afb0de remove custom record search converter 2018-08-16 19:11:57 +03:00
cagache
bb558e3ac4 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-18558_PermissionIssue 2018-06-12 16:03:42 +03:00
cagache
155d118672 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
2018-06-11 14:49:24 +03:00
Ross Gale
6f671e7aeb Merging up from 2.5.4 2018-06-06 10:06:07 +01:00
Ross Gale
993b4f5846 MNT-19442 merging up fix for 2.5.4 2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
ef1f8311be MNT-18558 Fix permission issue 2018-06-05 17:22:47 +03:00
Ross Gale
783bccb925 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Roxana Lucanu-Ghetu
7f5ba7a7f2 RM-6337 Code review changes 2018-05-31 16:11:34 +03:00
Roxana Lucanu-Ghetu
4659a93e71 RM-6337 Code review changes 2018-05-31 16:11:21 +03:00
Roxana Lucanu-Ghetu
6961f0aa18 RM-6337 Fix failing tests 2018-05-31 16:10:58 +03:00
Roxana Lucanu-Ghetu
1f6853b2ad RM-6337 Fix visibility conditions for accession step. 2018-05-31 16:10:43 +03:00
Sara Aspery
d4721683f6 Merge branch 'feature/RM-6318_SearchUpdatesForCert' into 'release/V2.7.0.x'
RM-6318 SearchDerivedByJavaAPI

See merge request records-management/records-management!996
2018-05-22 13:26:30 +01:00
Roxana Lucanu-Ghetu
8251588fd1 RM-6320 Code review changes. 2018-05-16 15:35:43 +03:00
Roxana Lucanu-Ghetu
5dd2640674 RM-6320 Added Declassification Review properties in records search 2018-05-16 11:03:32 +03:00
Ross Gale
c68ce588bb RM-6318 code review changes 2018-05-15 10:12:03 +01:00
Ross Gale
2345e871e1 RM-6302 code review comments addressed 2018-05-09 15:52:01 +01:00
Ross Gale
081dcddbea Merge branch 'master' into feature/RM-6302_EditDispositionSchedule 2018-05-09 14:33:33 +01:00
Ross Gale
888157199d search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
504d85e8d3 Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00
Ross Gale
308e86a4e5 RM-6302 adding the java work to edit disposition schedule 2018-05-02 21:52:08 +01:00
Ross Gale
b8af7ba22a JITC prevent accession disposition action being offered if there is an incomplete event 2018-05-01 17:51:13 +01:00
Roxana Lucanu-Ghetu
d85ded1a8e RM-5234 Minor refactor. 2018-04-30 21:00:40 +03:00
Ross Gale
a20ccc5705 WIP edit disposition capability 2018-04-30 11:52:47 +01:00
Roxana Lucanu-Ghetu
03579010f1 RM-5234 Fix Login filter 2018-04-30 10:08:19 +03:00
Tom Page
b37100c477 RM-5236 Refactor common code when getting node name. 2018-04-26 15:49:07 +01:00
Tom Page
04686978b3 RM-5236 Audit event for removing group members.
Also tidy up title of audit events so that the user group display
label is used if it exists.
2018-04-25 12:22:23 +01:00
Tom Page
524fc7f740 RM-5236 Audit event for adding member to user group. 2018-04-25 10:54:01 +01:00
Tom Page
4dc86b420d RM-5236 Audit user group events.
Add audit events for user group creation and deletion.

Also update the create user event so that the username is still displayed after the user is deleted.
2018-04-24 10:41:06 +01:00
Tom Page
9a8cc02e51 RM-5236 Audit events for creating and deleting a user group. 2018-04-24 08:45:56 +01:00
Rodica Sutu
9b28e44fa1 check if the node is rm specific; 2018-04-23 16:38:24 +03:00
Rashmi Itagi
efd1b237f2 Merge branch 'feature/RM-6249_SkipNodesWithExemptions_sm' into 'master'
RM-6249 Don't update the declassification date of nodes with exemptions.

See merge request records-management/records-management!937
2018-04-12 09:46:14 +01:00
Ross Gale
321d424d40 Merge branch 'feature/RM-6137_AddCategoryIdToSearch' into 'master'
RM-6137 Add record category identifier to search

See merge request records-management/records-management!956
2018-04-11 18:06:17 +01:00
Ross Gale
44bed4a796 RM-6137 Add record category identifier to search changes added 2018-04-10 17:11:26 +01:00
Roxana Lucanu-Ghetu
7795d3d8b0 RM-6171 Fix to display classify action from a collaboration site. 2018-04-05 11:52:20 +03:00
Roxana Lucanu-Ghetu
ddcfe2e8c7 RM-6171 Added restrictions for displaying classify option. 2018-04-04 15:16:18 +03:00
Tom Page
e85914c857 RM-6249 Don't update the declassification date of nodes with exemptions. 2018-03-27 15:29:16 +01:00
Roxana Lucanu-Ghetu
9080fc7976 RM-2053 Added classification capability restriction to classify action. Code review changes. 2018-03-27 01:25:49 +03:00
Rodica Sutu
b537bf6804 minor java docs update 2018-03-23 17:31:02 +02:00
Rodica Sutu
9d6bdeaa8b review changes 2018-03-23 17:28:21 +02:00