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
Ana Bozianu
bae4d0c394
RM-4717 - tests, one failing
2017-08-03 20:28:13 +03: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
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
cb31194cb1
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +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
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
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
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
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
Tuna Aksoy
5cfc0b3b1b
Merge branch 'feature-2.5/RM-5359_integration_test' into merge/RM25_20170709
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-authorities-SqlMap.xml
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-common-SqlMap.xml
2017-07-09 18:41:25 +01:00
alfresco-build
c9afdcaba1
[maven-release-plugin] prepare for next development iteration
2017-07-03 12:15:19 +01:00
alfresco-build
5cca06909b
[maven-release-plugin] prepare release V2.5.0.4
2017-07-03 12:15:16 +01:00
Tuna Aksoy
3c822e95cb
RM-5359 (An admin user can't declare as record a secured file)
2017-06-30 17:22:38 +01:00
Tuna Aksoy
1ce62e0434
Merge branch 'feature/RM-5345_Fix_security_issues' into 'master'
...
Feature/rm 5345 fix security issues
See merge request !374
2017-06-30 15:45:29 +01:00
Tuna Aksoy
f86440be72
RM-5345: Fixed review comments
2017-06-28 16:03:38 +01:00
Tuna Aksoy
6ad0698360
Merge branch 'release/V2.5' into merge/RM_25_2017_07_28
2017-06-28 14:36:45 +01:00
Tuna Aksoy
0ff080f305
RM-5347: Resources should be closed
2017-06-27 16:52:51 +01:00
Tuna Aksoy
813030506e
RM-5346: Null pointers should not be dereferenced
2017-06-27 16:35:51 +01:00
Tom Page
9e750f7f2b
MNT-18083 Merge release/V2.5.0.x into release/V2.5.
2017-06-27 16:24:40 +01:00
alfresco-build
674864c48a
[maven-release-plugin] prepare for next development iteration
2017-06-27 16:01:03 +01:00
alfresco-build
1afeabb314
[maven-release-plugin] prepare release V2.5.0.3
2017-06-27 16:01:00 +01:00
Sara Aspery
29517c366c
final change after review - replace logger method
2017-06-27 15:12:22 +01:00
Sara Aspery
cbabf8e545
updated serialId in new RecordMissingMetadataException
2017-06-27 12:48:59 +01:00
rwetherall
db19519dc7
Use the bean id in the cache key to prevent actions and identifiers clashing
2017-06-27 21:42:08 +10:00
rwetherall
fcab3c3bdf
Fix BaseEvaluator cache. Name missing from key.
2017-06-27 16:11:25 +10:00
rwetherall
1a13253d57
By pass public services to reduce bottle necks where appropriate
2017-06-27 13:38:01 +10:00
rwetherall
d030ede377
Transaction cache on BaseEvaluator.evaluate method
2017-06-27 13:13:25 +10:00
Sara Aspery
7269b33c65
changes following review
2017-06-26 12:41:02 +01:00
rwetherall
90cd720c42
Search browse performance improvements
...
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +01:00
Sara Aspery
fb215876b8
fixing IDE whitespaces
2017-06-24 22:49:27 +01:00
Sara Aspery
80434ce57e
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-23 16:40:00 +01:00
Sara Aspery
1400d3f657
tidied up REST tests
2017-06-23 11:54:40 +01:00
Silviu Dinuta
5dd5d27867
RM-5033: used aspect rma:ghosted to exclude destroyed records with kept
...
metadata
2017-06-23 13:01:40 +03:00
Silviu Dinuta
6349f27056
RM-5033: excluded destroyed records with metadata from search query
2017-06-22 11:43:08 +03:00
Richard Smith
85db28d4ff
RM-5311 - Fix the caching of swagger files
2017-06-22 09:26:33 +01:00
alfresco-build
a3bf6676d4
[maven-release-plugin] prepare for next development iteration
2017-06-21 21:43:06 +01:00
alfresco-build
cfc88fbcd2
[maven-release-plugin] prepare release V2.6.a
2017-06-21 21:43:03 +01:00
Tuna Aksoy
39802faa65
Update gs-core-api.yaml
2017-06-21 16:44:42 +01:00
Tuna Aksoy
228cd2cff8
Update gs-core-api.yaml
2017-06-21 16:43:34 +01:00
Tuna Aksoy
89dc4f1101
Update gs-core-api.yaml
2017-06-21 16:39:00 +01:00
Andy Healey
7c71da72d1
Update gs-core-api.yaml
2017-06-21 16:09:37 +01:00
alfresco-build
ef2d053d75
[maven-release-plugin] prepare for next development iteration
2017-06-21 13:36:58 +01:00
alfresco-build
4f1ebf1b5c
[maven-release-plugin] prepare release V2.5.2-EA2
2017-06-21 13:36:54 +01:00
Tuna Aksoy
fe44da1abe
Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
2017-06-20 16:07:26 +01:00
Sara Aspery
6b3c140bdd
correct message for Share
2017-06-20 15:48:25 +01:00
