Tom Page
7740f0d4e1
Merge branch 'merge/Merge25RulesTestsApiFixes' into 'master'
...
Merge/merge25 rules tests api fixes
See merge request !457
2017-08-10 15:50:27 +01:00
Oana Nechiforescu
a938333460
Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25RulesTestsApiFixes
...
# Conflicts:
# rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/CopyToRuleOnFolders.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/LinkToRuleOnFolders.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/MoveToRuleOnFolders.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/rules/FileToRuleAppliedOnClassifiedUnfiledRecords.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/rules/RulesAppliedOnWholeFilePlanClassifiedContent.java
# rm-automation/rm-automation-ui/src/test/resources/level2Tests.xml
# rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
2017-08-09 23:26:29 +03:00
Ana Bozianu
47a007028f
Merge master into feature/RM-4707_Classification_Reason_CRUD_REST_API
2017-08-08 17:59:59 +03:00
Ana Bozianu
2b3cf039c9
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
90b81182d3
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
a25a4cdc1d
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
a162ede8c5
Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-08 08:12:58 +01:00
Ana Bozianu
71bbde99eb
Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonJavaApi' into feature/RM-4717_ClassificationReasonsJavaApiTests
2017-08-08 09:12:05 +03:00
Ana Bozianu
c18fc6af20
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
c47cc52935
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
16300ef0ff
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
3ef87e30cb
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
0daeb5cfaf
add rest api tests for declassificationTimeFrame
2017-08-04 15:04:34 +03:00
Richard Smith
fdcdc69511
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-08-04 10:48:47 +01:00
Ana Bozianu
b936f40326
RM-4717 - tests, one failing
2017-08-03 20:28:13 +03:00
Tom Page
b2d5dcddb9
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
c58f7af109
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
50f5919890
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
a1395f16eb
RM-4729: Declassification timeframe API Implementation
2017-08-02 13:29:40 +01:00
Richard Smith
26e3cd5244
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
c96de1018d
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-08-01 13:58:30 +01:00
Richard Smith
854706d0c3
Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm
2017-08-01 09:25:21 +01:00
Rodica Sutu
fbe2e3dae3
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
39e2df3a68
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
de4a73c225
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-26 10:30:02 +01:00
Tom Page
c659cc8b4f
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
b0eab6c382
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
93f8f20ca8
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-25 09:07:18 +01:00
Tom Page
9968be71d0
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
d16343e480
MNT-18082 Merge release/V2.5 into master.
2017-07-24 18:55:49 +01:00
Tom Page
3bdbee6a01
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Tom Page
a89fbdede0
MNT-18083 Merge release/V2.5 into master.
2017-07-24 18:45:44 +01:00
Tom Page
a808a4a213
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
f4ae56f84b
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
dc18563bf7
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
96ee22624b
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +01:00
Ramona Popa
139f1ed1df
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
c3a3136fb4
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Tom Page
0a58d8bc6b
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
a7c69d4c11
Merge release/V2.5 into merge-2.5/MNT-18082_HotFixV2.5.0.4.
2017-07-19 09:00:28 +01:00
Tom Page
250ae1e9db
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
9b077c503b
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
7cc058b561
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
dd4ac354b4
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
5cc758a274
Update action-service.properties
2017-07-13 09:31:56 +01:00
Andy Healey
816705a840
DOCS-3531 - Update records-management-service.properties
2017-07-12 14:35:09 +01:00
Andy Healey
22f098ed35
DOCS-3531 - Update action-service.properties
2017-07-12 14:33:22 +01:00
Richard Smith
0d72d21701
Merge branch 'master' into feature/RM-4613_Select_Single_Instruction
2017-07-11 10:06:39 +01:00
Tuna Aksoy
e6837bc2ef
(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
9e832df5ec
RM-5345: Fixed review comments (cherry picked from commit 16ead6e)
...
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 2220fd8
2017-07-10 16:47:44 +01:00
