inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,945 Commits 324 Branches 2,170 Tags
211ebba2f232d2e8cf86325bdce4941b8bac9284
Commit Graph

699 Commits

Author SHA1 Message Date
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
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
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
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
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
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
37d1b200a2 RM-5309 - Remove shared link if exists when a record is declared 2017-06-16 18:44:14 +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
f479000e61 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into 'release/V2.5' 
Feature 2.5/rm 5175 complete record missing metadata

See merge request !324
 2017-06-12 21:42:17 +01:00
Tuna Aksoy
64892424b2 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
f4cdbf12e1 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into merge/RM_25 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
 2017-06-12 20:42:51 +01:00
Sara Aspery
09e3766230 RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +01:00
Tuna Aksoy
06a48d73cd Merged release/V2.5 and addressed review comments 2017-06-12 16:41:30 +01:00
Tuna Aksoy
1712bac995 RM-4689 (Can delete all RM site content through Repository browser) 
Manually backported following changes:

RM-4293
734c1b2a82

RM-4326
a4aac053a8
c6ca74ab26
 2017-06-12 16:17:24 +01:00
Sara Aspery
d98d3e9c69 RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Sara Aspery
11f9c6c3e7 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:49:56 +01:00
Sara Aspery
a7fddef34b RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Sara Aspery
e579b51cf9 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-01 14:42:02 +01:00
Sara Aspery
8665ddafb9 RM-4431 CompleteRecordActionRestAPI 2017-06-01 14:08:16 +01:00
Ana Bozianu
953a5c3d96 RM-5244 - added extra check for efficiency 2017-05-31 17:10:43 +03:00
Ana Bozianu
4139f2514b 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
Ana Bozianu
18c7b07d8b Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
fe11ba2df7 RM-5180 - record rejection implementation and integration test 2017-05-25 18:53:15 +03:00
Ana Bozianu
9efc13617d Merge branch 'feature/RM-5012_recordIdentifier' into 'master' 
RM-5012 - run on add record policy as system

See merge request !300
 2017-05-23 09:13:33 +01:00
Ana Bozianu
921c2d00d8 RM-5012 - run on add record policy as system 2017-05-23 11:02:08 +03:00
Tom Page
fa1e703428 Update copyright header. 2017-05-23 08:55:10 +01:00
Ramona Popa
be442afda6 RM-5148 - added support for autoRename for uploadRecord too 2017-05-22 18:27:04 +03:00
Ana Bozianu
6a7313ac1d Merge branch 'feature/RM-5012_recordIdentifier' into 'master' 
RM-5223 - can't get rid of record identifier

See merge request !292
 2017-05-21 17:17:02 +01:00
Sara Aspery
b6df631e4e Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-05-20 19:31:10 +01:00
Ramona Popa
240d1349df Feature/rm 5148 create folder and records using auto rename 2017-05-19 18:14:38 +01:00
Sara Aspery
a7f6ae427e RM-4431 Complete Record Action REST API 2017-05-19 14:45:02 +01:00