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,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

595 Commits

Author SHA1 Message Date
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
Sara Aspery
edaf20e82a tidied up REST tests 2017-06-23 11:54:40 +01:00
Silviu Dinuta
17497ac571 RM-5033: used aspect rma:ghosted to exclude destroyed records with kept 
metadata
 2017-06-23 13:01:40 +03:00
Silviu Dinuta
23a261cd6d RM-5033: excluded destroyed records with metadata from search query 2017-06-22 11:43:08 +03: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
14cb548edd correct message for Share 2017-06-20 15:48:25 +01:00
Sara Aspery
16e23633f4 refactor complete record Rest API 2017-06-20 13:58:19 +01:00
Ramona Popa
af033364bd RM-5309 - typo 2017-06-20 14:34:47 +03:00
Ramona Popa
39541038e1 RM-5309 - fix after review 2017-06-20 14:33:28 +03: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
Sara Aspery
8762162552 Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI 2017-06-19 18:56:53 +01:00
Sara Aspery
6db7ca6ebe more_declare_record_refactoring 2017-06-19 18:06:34 +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
Sara Aspery
f02b41a137 updated from master 2017-06-15 11:04:23 +01:00
Tuna Aksoy
6e223c1f96 Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Sara Aspery
0e8b41aca6 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
0a83b44d98 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
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
96fdd50b39 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
d57ac09c1d RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +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
Sara Aspery
bc0a9431ce RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Sara Aspery
658f064a8d RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:49:56 +01:00
Sara Aspery
662e805f55 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Sara Aspery
5467cb02d1 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
051936f5cf RM-4431 CompleteRecordActionRestAPI 2017-06-01 14:08:16 +01:00
Ana Bozianu
e886317bf5 RM-5244 - added extra check for efficiency 2017-05-31 17:10:43 +03: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
Ana Bozianu
60fb7d2051 Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
fa0ae148c3 RM-5180 - record rejection implementation and integration test 2017-05-25 18:53:15 +03:00
Ana Bozianu
feb70308ce 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
bd2fdca906 RM-5012 - run on add record policy as system 2017-05-23 11:02:08 +03:00
Tom Page
d2b3af5a28 Update copyright header. 2017-05-23 08:55:10 +01:00
Ramona Popa
655bc7f5bc RM-5148 - added support for autoRename for uploadRecord too 2017-05-22 18:27:04 +03:00
Ana Bozianu
6bd74a1b4b 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
23c4684e70 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
d34754fb7c Feature/rm 5148 create folder and records using auto rename 2017-05-19 18:14:38 +01:00
Sara Aspery
5ca8f91892 RM-4431 Complete Record Action REST API 2017-05-19 14:45:02 +01:00
Ana Bozianu
232c42be6c RM-5012 - fix "can't get rid of the identifier" 2017-05-19 15:37:36 +03:00
Ramona Popa
99faac4dbd Merge branch 'feature/RM-5087_UpdateNotesForGETEndpoints' into 'master' 
RM-5087 - Updated yaml file for include parameter

See merge request !254
 2017-05-19 08:38:39 +01:00
Ana Bozianu
d8dc91fdd2 Merge 'master' into feature/RM-5012_recordIdentifier 2017-05-18 11:36:43 +03:00
Ana Bozianu
2dd203a104 RM-5012 - fixed write new record permissions and duplicate identifier infinite transaction retry 2017-05-18 11:16:03 +03:00
Ramona Popa
f3f0afe4ac Merge branch 'master' into feature/RM-5087_UpdateNotesForGETEndpoints 2017-05-17 18:12:09 +03:00
Ramona Popa
eaf03d0b46 RM-5087 - more refactor 2017-05-17 18:12:00 +03:00
Ana Bozianu
c8e47639a3 RM-5012 - fix unit tests and cleanedup merge request 2017-05-17 16:04:54 +03:00
Ana Bozianu
77b875c232 RM-5012 - fix compilation failure 2017-05-17 15:04:15 +03:00
Ana Bozianu
1e2b5967c4 RM-5012 - generate identifier on record declare 2017-05-17 14:55:06 +03:00