Commit Graph

5172 Commits

Author SHA1 Message Date
Tom Page
65a3919d2f Merge release/V2.7.0.x into release/V2.7. 2018-05-18 06:51:45 +01:00
Tom Page
f838f6a90e Update version to V2.7.0.1-SNAPSHOT. 2018-05-18 06:51:02 +01:00
jcule
280fb0f422 RM-6310: sc:securityMarksSearch is not properly updated when editing the content classification (affects the results from RM search results): automation test 2018-05-17 22:46:53 +01:00
alfresco-build
bab3604934 [maven-release-plugin] prepare for next development iteration 2018-05-17 13:53:57 +01:00
alfresco-build
1a48c3e689 [maven-release-plugin] prepare release V2.7.b ags-2.7.b 2018-05-17 13:53:55 +01:00
Jelena Cule
6617577e19 Merge branch 'master' into 'feature/RM-6318_SearchForDerivedByAndClassificationReasons_AutomateAC'
Sync with master

See merge request records-management/records-management!1003
2018-05-17 13:12:44 +01:00
alfresco-build
b4426f4e27 [maven-release-plugin] prepare for next development iteration 2018-05-17 11:49:15 +01:00
alfresco-build
cfad6fdf74 [maven-release-plugin] prepare release V2.7.b 2018-05-17 11:49:13 +01:00
jcule
fdfd6279bd RM-6302: Add Edi tFunctionality To Disposition Schedule: automation tests 2018-05-16 18:22:28 +01:00
Roxana Lucanu-Ghetu
8251588fd1 RM-6320 Code review changes. 2018-05-16 15:35:43 +03:00
jcule
79873a908d RM-6302: Add Edi tFunctionality To Disposition Schedule: automation tests 2018-05-16 11:55:14 +01: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
233fa33afb Merge branch 'release/V2.7' 2018-05-15 09:01:56 +01:00
Ross Gale
e2665e0c2f record only merge with 2.7.0.x 2018-05-15 09:01:01 +01:00
Tom Page
38ba822d29 Record-only merge release/V2.7 into master. 2018-05-15 08:08:25 +01:00
Ross Gale
0866f80b59 Merge branch 'feature/RM-6302_EditDispositionSchedule' into 'release/V2.7.0.x'
merge edit disposition fix to 2.7.0.x

See merge request records-management/records-management!998
2018-05-14 17:02:54 +01:00
Ross Gale
b52bdf395c Merge branch 'feature/RM-6302_EditDispositionSchedule' into 'release/V2.7'
merging edit disposition schedule to 2.7

See merge request records-management/records-management!997
2018-05-14 17:02:04 +01:00
Ross Gale
d80cd3698e Merge branch 'feature/RM-6302_EditDispositionSchedule' into 'master'
Adding the ability to block disposition step completion until all events in the step have been resolved

See merge request records-management/records-management!977
2018-05-14 16:59:42 +01:00
Tom Page
0d32715f19 Revert "[maven-release-plugin] prepare release V2.7.b"
This reverts commit 62f5c84f2e.
2018-05-14 14:02:36 +01:00
Tom Page
a627422919 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit e1c5b749ed.
2018-05-14 14:02:34 +01:00
alfresco-build
e1c5b749ed [maven-release-plugin] prepare for next development iteration 2018-05-14 13:49:40 +01:00
alfresco-build
62f5c84f2e [maven-release-plugin] prepare release V2.7.b 2018-05-14 13:49:38 +01:00
cagache
7f904edcfd Merge branch 'release/V2.7' 2018-05-14 14:24:41 +03:00
cagache
80c3582878 Merge remote-tracking branch 'remotes/origin/release/V2.7.0.x' into release/V2.7 2018-05-14 14:19:42 +03:00
Claudia Agache
6a44198d5a Merge branch 'hotfix-2.7/RM-6311_TestRMSearchOrderByMarks_sm' into 'release/V2.7.0.x'
RM-6311 added API test to check that rm search results are sorted by marks

See merge request records-management/records-management!994
2018-05-14 10:03:46 +01:00
cagache
cc97785d23 code review changes 2018-05-14 11:07:06 +03:00
cagache
7c41b89cf3 RM-6311 wait for the expected records to be in the search results list 2018-05-11 17:26:09 +03:00
cagache
d0c4593a50 RM-6311 added API test to check that rm search results are ordered by security marks 2018-05-11 16:54:54 +03:00
Rodica Sutu
e87bfb626b Merge branch 'master' of git.alfresco.com:records-management/records-management 2018-05-11 09:21:11 +03:00
Jelena Cule
24ced5d13a Merge branch 'master' into 'feature/RM-6302_EditDispositionSchedule'
Syncing with master

See merge request records-management/records-management!985
2018-05-10 10:23:13 +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
Tom Page
ebd7ac2956 Update version to V3.0.0-SNAPSHOT. 2018-05-09 09:15:34 +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
Rodica Sutu
ed5fc95bf3 Merge remote-tracking branch 'remotes/origin/feature/RM-6302_EditDispositionSchedule' 2018-05-04 14:57:14 +03:00
Tom Page
5ff6808ecc Record-only merge of release/V2.7 into master. 2018-05-04 10:28:59 +01:00
Tom Page
b3f9f0bd52 Record-only merge release/V2.7.0.x into release/V2.7. 2018-05-04 10:22:30 +01:00
Tom Page
29ab436eaf Update version to V2.7.1-SNAPSHOT. 2018-05-04 10:18:40 +01:00
alfresco-build
7b15eb6963 [maven-release-plugin] prepare for next development iteration 2018-05-04 10:10:11 +01:00
alfresco-build
606c1637d3 [maven-release-plugin] prepare release V2.7.0 ags-2.7.0 2018-05-04 10:10:09 +01:00
jcule
83635643e6 RM-6288: Record Search of classified files with marks return also the files classified only with classification levels: api test 2018-05-03 18:01:16 +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
Claudia Agache
3fbc054881 Merge branch 'feature/RM-5234_FilterByLoginEventsTests_fp' into 'master'
RM-5234 Filter audit logs by Login events

See merge request records-management/records-management!972
2018-04-30 19:05:17 +01:00
Roxana Lucanu
3beaf71bb1 Merge branch 'feature/RM-5234_AuditEventsFilter_fp' into 'master'
RM-5234 Fix Login filter

See merge request records-management/records-management!971
2018-04-30 19:01:18 +01:00
Roxana Lucanu-Ghetu
d85ded1a8e RM-5234 Minor refactor. 2018-04-30 21:00:40 +03:00
gbroadbent
9f38cddb3a SIMPLIFIED CHINESE: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:12:29 +01:00
gbroadbent
dc10fcb806 BRAZILIAN Portuguese: Updated bundle based on EN-RM-rev2018-04-30T100445 2018-04-30 17:11:49 +01:00