Ana Bozianu
bffa718143
Merge branch 'feature/RM-4717_ClassificationReasonsJavaApiTests' into 'master'
...
Feature/rm 4717 classification reasons java api tests
See merge request !437
2017-08-08 15:25:19 +01:00
Richard Smith
39f26c88ef
Merge branch 'feature/RM-5332_Classification_Topic_Picker_Automation_sm' into 'master'
...
Feature/rm 5332 classification topic picker automation sm
See merge request !422
2017-08-08 08:59:46 +01:00
Tuna Aksoy
f6b3bf9c34
Merge branch 'master' into feature/RM-4707_Classification_Reason_CRUD_REST_API
...
# Conflicts:
# rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/classification/guides/CombinedInstructionsTest.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
2017-08-08 08:40:23 +01:00
Richard Smith
a9909912ec
Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-08 08:12:58 +01:00
Ana Bozianu
2e07dbfb9b
Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonJavaApi' into feature/RM-4717_ClassificationReasonsJavaApiTests
2017-08-08 09:12:05 +03:00
Ana Bozianu
d6bf364f9a
Merge branch 'feature/RM-4717_ClassificationReasonJavaApi' into 'master'
...
Feature/rm 4717 classification reason java api
See merge request !400
2017-08-08 06:41:28 +01:00
Ana Bozianu
986e30eec3
Merge branch 'feature/RM-4717_MergeFromMaster_cg' into 'feature/RM-4717_ClassificationReasonJavaApi'
...
Feature/rm 4717 merge from master cg
See merge request !444
2017-08-07 10:00:23 +01:00
Tuna Aksoy
642e8b2ac8
Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonsJavaApiTests' into feature/RM-4707_Classification_Reason_CRUD_REST_API
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
2017-08-04 15:09:02 +01:00
Richard Smith
d0a650b357
Merge branch 'feature/RM-4613_Select_Single_Instruction' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-04 14:47:12 +01:00
Rodica Sutu
ec48fcc45c
add rest api tests for declassificationTimeFrame
2017-08-04 15:04:34 +03:00
Richard Smith
f79f27824b
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-08-04 10:48:47 +01:00
Ana Bozianu
bae4d0c394
RM-4717 - tests, one failing
2017-08-03 20:28:13 +03:00
Tom Page
f957a60a5c
Merge branch 'feature/RM-5841_EmptyReasonId_cg' into 'master'
...
RM-5481 Handle empty string as a reason or exemption id.
See merge request !431
2017-08-03 13:18:49 +01:00
Tom Page
277d9aabbd
RM-5481 Handle empty string as a reason or exemption id.
...
If the empty string is passed as a classification reason or exemption id then the API framework
converts it to null for us. We should throw a 404 (not found) error, because there are no reasons
or exemptions with the empty string as their id (or null for that matter). Add two new REST API
tests for these cases.
Also stopped using the helper method addParam in TopicsWithInstructionsTest, as it is only saving us
about ten characters, causes an extra import and includes an explicit mention of the topicsApi
inside it (i.e. it doesn't work at all with the guidesAPI).
2017-08-03 13:10:37 +01:00
Tuna Aksoy
9aeb46f9f2
Merge remote-tracking branch 'origin/feature/RM-4729_Declassification_Timeframe_REST_API' into feature/RM-4709_Declassification_Time_Frame_REST_API
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/declassification/DeclassificationTimeFrameService.java
2017-08-02 13:32:25 +01:00
Tuna Aksoy
25613d75d9
RM-4729: Declassification timeframe API Implementation
2017-08-02 13:29:40 +01:00
Richard Smith
d5e9516cff
Merge branch 'feature/RM-4613_Select_Single_Instruction' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-01 14:11:59 +01:00
Richard Smith
f311e47d2d
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-08-01 13:58:30 +01:00
Richard Smith
9cbd38d506
Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-01 09:25:21 +01:00
Rodica Sutu
2a2a8cc3a2
Merge branch 'merge/RM-5308_TestForShareRecordsViaAPI' into 'master'
...
Merge/rm 5308 test for share records via api
See merge request !415
2017-07-27 15:13:31 +01:00
Rodica Sutu
5234bc8da9
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge/RM-5308_TestForShareRecordsViaAPI
...
# Conflicts:
# rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
2017-07-27 09:36:48 +03:00
Richard Smith
87471d3257
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-26 10:30:02 +01:00
Tom Page
e77b598a8f
Merge branch 'merge/MNT-18082_V2.5.0.4' into 'master'
...
Merge/mnt 18082 v2.5.0.4
See merge request !409
2017-07-25 13:44:11 +01:00
Tom Page
7d57230b23
Merge branch 'merge/RM-5309_PreventSharingRecords' into 'master'
...
Merge/rm 5309 prevent sharing records
See merge request !399
2017-07-25 13:43:03 +01:00
Richard Smith
2d06bda9b5
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-25 09:07:18 +01:00
Tom Page
55b0268166
Merge branch 'merge/MNT-18083_SearchPerformance' into 'master'
...
Merge/mnt 18083 search performance
See merge request !398
2017-07-25 08:12:52 +01:00
Tom Page
0e0462911e
MNT-18082 Merge release/V2.5 into master.
2017-07-24 18:55:49 +01:00
Tom Page
88a3c42750
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Tom Page
7e1b33dad7
MNT-18083 Merge release/V2.5 into master.
2017-07-24 18:45:44 +01:00
Tom Page
f62419b5cd
Merge branch 'merge-2.5/Fix250xTests' into 'release/V2.5'
...
Merge 2.5/fix250x tests
See merge request !397
2017-07-24 18:38:18 +01:00
Tom Page
04ad0e73b1
Merge branch 'merge-2.5/MNT-18082_HotFixV2.5.0.4' into 'release/V2.5'
...
Merge 2.5/mnt 18082 hot fix v2.5.0.4
See merge request !389
2017-07-24 18:37:32 +01:00
Tom Page
ff31236cd5
Merge branch 'feature/RM-5420_RefactorRestAPIModel_cg' into 'master'
...
Feature/rm 5420 refactor rest api model cg
See merge request !391
2017-07-24 18:23:03 +01:00
Tom Page
cb31194cb1
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +01:00
Ramona Popa
943c3550ae
Merge branch 'feature-2.5/RM-5308_ShareRecordsViaWebscript' into 'release/V2.5'
...
RM-5308 - added behaviour bean for qshare:shared aspect and integration test
See merge request !392
2017-07-20 16:27:10 +01:00
Ramona Popa
1eb4e09a83
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Tom Page
b1fe4155f5
Merge merge-2.5/MNT-18082_HotFixV2.5.0.4 into merge-2.5/Fix250xTests.
2017-07-19 09:04:42 +01:00
Tom Page
aceca1fca2
Merge release/V2.5 into merge-2.5/MNT-18082_HotFixV2.5.0.4.
2017-07-19 09:00:28 +01:00
Tom Page
a473316d3d
Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5'
...
Merge 2.5/mnt 18083 search performance
See merge request !373
2017-07-19 08:39:44 +01:00
Tom Page
da4a1d2e85
Merge release/V2.5.0.x into release/V2.5.
...
Record-only merge of changes to get UI tests to pass (actually this makes
one small change to remove an unused import).
2017-07-18 13:51:32 +01:00
Tom Page
019490744f
Merge release/V2.5.0.x into release/V2.5.
...
Merge changes needed for release of V2.5.0.4.
2017-07-18 13:31:45 +01:00
Andy Healey
ebf3e67921
Merge branch 'feature/UAreview_2.6_newstrings' into 'master'
...
Feature/uareview 2.6 newstrings
See merge request !386
2017-07-13 10:55:48 +01:00
Andy Healey
2fa6760a26
Update action-service.properties
2017-07-13 09:31:56 +01:00
Andy Healey
96e5b3bb8f
DOCS-3531 - Update records-management-service.properties
2017-07-12 14:35:09 +01:00
Andy Healey
e8591d0cfb
DOCS-3531 - Update action-service.properties
2017-07-12 14:33:22 +01:00
Richard Smith
bbf7fb877c
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-11 10:06:39 +01:00
Tuna Aksoy
76d0c19bde
(Record only) Merge branch 'release/V2.5'
...
# Conflicts:
# pom.xml
# rm-automation/pom.xml
# rm-community/pom.xml
# rm-community/rm-community-repo/pom.xml
# rm-community/rm-community-share/pom.xml
# rm-enterprise/pom.xml
# rm-enterprise/rm-enterprise-repo/pom.xml
# rm-enterprise/rm-enterprise-share/pom.xml
2017-07-10 16:56:11 +01:00
Tuna Aksoy
402ea0ca9a
RM-5345: Fixed review comments (cherry picked from commit f86440b)
...
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 8130305
2017-07-10 16:47:44 +01:00
Richard Smith
185f719c57
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-10 14:28:31 +01:00
alfresco-build
e46b3eae0f
[maven-release-plugin] prepare for next development iteration
2017-07-10 14:21:19 +01:00
alfresco-build
a81c2eb8d8
[maven-release-plugin] prepare release V2.5.2
2017-07-10 14:21:16 +01:00
