Commit Graph

350 Commits

Author SHA1 Message Date
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
eae9ffcec6 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
Ross Gale
f21bed1e01 Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Ross Gale
89e9032a14 RM-5883 adding updated schema number to ensure patch runs in later upgrades, including break command to ensure patch will only run once 2017-12-08 14:49:47 +00:00
Ross Gale
caa99535a1 Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
Ross Gale
f70ad4df3e RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
gbroadbent
c2c4e74a1a NORWEGIAN Bokmal, ITALIAN, RUSSIAN and SIMPLIFIED CHINESEupdated files based on revEN-RM-rev2017-11-27T143242. Full fix for ticket LOC-29 2017-11-08 10:27:00 +00:00
gbroadbent
bc5835afa9 SPANISH: 2.6 community version updated Spanish file based on revEN-RM-rev2017-11-27T143242. Partial fix LOC-29 2017-11-07 14:06:44 +00:00
gbroadbent
13737d65e1 SPANISH: 2.6 community version updated Spanish bundle based on revEN-RM-rev2017-11-06. Updated 4 strings since last commit. Partial fix LOC-29 2017-11-06 15:25:01 +00:00
gbroadbent
f8ca7bdd1d JAPANESE: 2.6 community version updated Japanese bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 13:50:38 +00:00
gbroadbent
9a6d63a87f SIMPLIFIED CHINESE: 2.6 community version updated Simplified Chinese bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:37:42 +00:00
gbroadbent
33fc1ea9b9 BRAZILIAN Portuguese: 2.6 community version updated Brazilian Portuguese bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:36:39 +00:00
gbroadbent
db42cc7efc RUSSIAN: 2.6 community version updated Russian bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:35:40 +00:00
gbroadbent
9f3f02aa35 DUTCH: 2.6 community version updated Dutch bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:34:44 +00:00
gbroadbent
8fc68cbe28 NORWEGIAN Bokmal: 2.6 community version updated Norwegian Bokmal bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:33:56 +00:00
gbroadbent
d76d2bc5c9 ITALIAN: 2.6 community version updated Italian bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:32:54 +00:00
gbroadbent
33392ab25d FRENCH: 2.6 community version updated French bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:31:45 +00:00
gbroadbent
76bc243a41 SPANISH: 2.6 community version updated Spanish bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:30:56 +00:00
gbroadbent
368a8f2d06 GERMAN: 2.6 community version updated German bundle based on revEN-RM-rev2017-10-27T143242. Partial fix LOC-29 2017-11-06 11:30:08 +00:00
Ana Bozianu
28704ef015 Feature/rm 5655 classification beyond highest child 2017-09-29 11:39:00 +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
Ramona Popa
c3a3136fb4 RM-5309 - added behaviour bean for qshare:shared aspect and integration test 2017-07-20 11:48:10 +03: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
Tom Page
082ec147f7 MNT-18083 Merge release/V2.5.0.x into release/V2.5. 2017-06-27 16:24:40 +01:00
rwetherall
21a2cc6d39 By pass public services to reduce bottle necks where appropriate 2017-06-27 13:38:01 +10:00
rwetherall
a5409044c5 Transaction cache on BaseEvaluator.evaluate method 2017-06-27 13:13:25 +10:00
rwetherall
875fd314b2 Search browse performance improvements
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +01:00
Sara Aspery
c4342a2a03 fixing IDE whitespaces 2017-06-24 22:49:27 +01:00
Sara Aspery
7fee3f4323 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-23 16:40:00 +01:00
Tuna Aksoy
651554b49b 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
953d7b32f4 include_declare_record_refactoring_in_Rest 2017-06-20 11:12:22 +01:00
Sara Aspery
997ddd49b4 Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI"
This reverts commit 8762162552, reversing
changes made to e9ba89f7bf.
2017-06-20 08:27:09 +01:00
Ramona Popa
aa235007d5 RM-5309 - Remove shared link if exists when a record is declared 2017-06-16 18:44:14 +03:00
Tuna Aksoy
6e223c1f96 Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Tuna Aksoy
37a1be2fea Merge branch 'feature-2.5/RM-4689_Can_delete_RM_site_content_in_browser' into merge/RM_25
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/UnfiledRecordContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4293Test.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerTypeUnitTest.java
2017-06-12 21:03:15 +01:00
Tuna Aksoy
d94771f216 Merged release/V2.5 and addressed review comments 2017-06-12 16:41:30 +01:00
Tuna Aksoy
b1f84e86c5 RM-4689 (Can delete all RM site content through Repository browser)
Manually backported following changes:

RM-4293
135c4e04e0

RM-4326
fce705ff72
0836e9682b
2017-06-12 16:17:24 +01:00
Ana Bozianu
b2b936b28f RM-5244 - make sure the incomplete node tagger is run after the record aspect is added (workaround) 2017-05-31 16:55:56 +03:00
Tom Page
c108ec7940 Cherry-pick RM-4234 into release/V2.5.0.x (2.5.1 performance improvements).
(cherry picked from commit 6a53e953f5)
2017-05-24 09:53:24 +01:00
Tom Page
d2b3af5a28 Update copyright header. 2017-05-23 08:55:10 +01:00
Ana Bozianu
232c42be6c RM-5012 - fix "can't get rid of the identifier" 2017-05-19 15:37:36 +03:00
Ana Bozianu
1e2b5967c4 RM-5012 - generate identifier on record declare 2017-05-17 14:55:06 +03:00
Ana Bozianu
097ebc28a5 RM-5012 - make record on first event and add identifier on commit or on record complete 2017-05-17 12:58:50 +03:00
Ana Bozianu
35310e452f RM-5012 - fix some tests 2017-05-15 22:34:09 +03:00
Ana Bozianu
ae37cd4d82 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-04 18:43:51 +03:00
Ramona Popa
7352c1fae0 RM-4921 - use retrying transaction for all write operations: create and update 2017-05-04 18:22:56 +03:00
Ana Bozianu
b59311de99 Merge 'feature/RM-4921_ExceptionsDoneOnTransactionCommit' into feature/RM-5012_recordIdentifier 2017-05-03 22:16:53 +03:00