Commit Graph

4348 Commits

Author SHA1 Message Date
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
5d02384f24 tidy up 2017-06-25 11:01:11 +01:00
Sara Aspery
fb215876b8 fixing IDE whitespaces 2017-06-24 22:49:27 +01:00
Sara Aspery
822f046e0d changes following review 2017-06-23 18:16:38 +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
bf06f075d4 corrected comment 2017-06-23 16:24:47 +01:00
Silviu Dinuta
5ef418d4b7 Merge branch 'feature-2.5/RM-5033_excludeAlsoDestroyedNonElectronicRecords' into 'release/V2.5'
RM-5033: used aspect rma:ghosted to exclude destroyed records with kept

See merge request !365
2017-06-23 14:48:23 +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
Richard Smith
6cccc25f8f Merge branch 'feature/RM-5311_Fix_Swagger_Caching' into 'master'
RM-5311 - Fix the caching of swagger files

See merge request !363
2017-06-22 10:38:55 +01:00
Silviu Dinuta
42bf4f6ad5 Merge branch 'feature-2.5/RM-5033_ReviewNotificationEmailSentForDestroyedRecordWithMetadata' into 'release/V2.5'
RM-5033: excluded destroyed records with metadata from search query

See merge request !364
2017-06-22 10:11:20 +01: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 ags-2.6.a 2017-06-21 21:43:03 +01:00
Tuna Aksoy
7fb5e4fc6d Merge branch 'feature/UA_API_review2' into 'master'
Update gs-core-api.yaml

See merge request !362
2017-06-21 16:45:11 +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
Sara Aspery
f9c4ef0f41 fixing tests 2017-06-21 15:34:00 +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 ags-2.5.2-EA2 2017-06-21 13:36:54 +01:00
Tuna Aksoy
b161cc041a Merge branch 'merge/20170620_RM25' into 'master'
Merge/20170620 rm25

See merge request !360
2017-06-21 10:34:57 +01:00
Tuna Aksoy
ffee5eac1a Merge branch 'release/V2.5' into merge/20170620_RM25 2017-06-20 17:43:36 +01:00
Ramona Popa
ea068a3a36 Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into 'release/V2.5'
RM-5309 - Remove shared link if exists when a record is declared

See merge request !350
2017-06-20 17:31:14 +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
Tuna Aksoy
2c3dc0698b Merge branch 'release/V2.5' into merge/20170620_RM25
# Conflicts:
#	rm-community/pom.xml
2017-06-20 16:04:36 +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
Tuna Aksoy
9a9c6936d5 Merge branch 'feature-2.5/Update_community_dependency' into 'release/V2.5'
Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer …

See merge request !358
2017-06-20 10:11:31 +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
75b35cdcd7 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-19 18:08:16 +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
Silviu Dinuta
97cd78a882 Merge branch 'feature/RM-5237_InfiniteLoopIfOneDeclareInPlaceRecordEventFails' into 'master'
RM-5237: fixed issue in benchmark project

See merge request !345
2017-06-16 09:08:57 +01:00
Silviu Dinuta
b9baa5d408 RM-5237: fixed issue in benchmark project, added a commented test to
reproduce the issue in rest api tests
2017-06-15 19:33:07 +03:00
Sara Aspery
95a406cb30 updated from master 2017-06-15 11:04:23 +01:00
Tuna Aksoy
21c881593a Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Sara Aspery
28356584c1 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-14 13:05:53 +01:00
Tuna Aksoy
bc931b795a Merge branch 'merge/RM-2370_RM-4689_RM-5175' into 'master'
Merge/rm 2370 rm 4689 rm 5175

See merge request !338
2017-06-13 06:49:30 +01:00