Commit Graph

1278 Commits

Author SHA1 Message Date
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
Sara Aspery
214f593680 refactor complete record Rest API 2017-06-20 13:58:19 +01:00
Ramona Popa
51746da088 Merge branch 'release/V2.5' into feature-2.5/RM-5309_SharedFilesCannotBeClasified 2017-06-20 14:36:55 +03:00
Ramona Popa
5e906d878c RM-5309 - typo 2017-06-20 14:34:47 +03:00
Ramona Popa
8214f6d23e RM-5309 - fix after review 2017-06-20 14:33:28 +03:00
Sara Aspery
57b3460b58 include_declare_record_refactoring_in_Rest 2017-06-20 11:12:22 +01:00
Sara Aspery
15b1bc41cd Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI"
This reverts commit 6ff9179588, reversing
changes made to 75b35cdcd7.
2017-06-20 08:27:09 +01:00
Tuna Aksoy
e3cecf0f89 Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer for Repo/Share 5.1.g combination. 2017-06-19 22:08:25 +01:00
Sara Aspery
6ff9179588 Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI 2017-06-19 18:56:53 +01:00
Sara Aspery
29a057adeb more_declare_record_refactoring 2017-06-19 18:06:34 +01:00
Ramona Popa
15e308a547 RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed 2017-06-19 17:46:34 +03:00
Ramona Popa
37d1b200a2 RM-5309 - Remove shared link if exists when a record is declared 2017-06-16 18:44:14 +03:00