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,653 Commits 324 Branches 2,170 Tags
f85f9f3a057286f6522a255a07e6b452e3ce66f7
Commit Graph

621 Commits

Author SHA1 Message Date
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
Ana Bozianu
774a700716 RM-5012 - fix "can't get rid of the identifier" 2017-05-19 15:37:36 +03:00
Ramona Popa
72b81bcaaa 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
697c94d916 Merge 'master' into feature/RM-5012_recordIdentifier 2017-05-18 11:36:43 +03:00
Ana Bozianu
e1c3507c9a RM-5012 - fixed write new record permissions and duplicate identifier infinite transaction retry 2017-05-18 11:16:03 +03:00
Ramona Popa
958c9d7e20 Merge branch 'master' into feature/RM-5087_UpdateNotesForGETEndpoints 2017-05-17 18:12:09 +03:00
Ramona Popa
31b0e27fae RM-5087 - more refactor 2017-05-17 18:12:00 +03:00
Ana Bozianu
98b10e616f RM-5012 - fix unit tests and cleanedup merge request 2017-05-17 16:04:54 +03:00
Ana Bozianu
518c131977 RM-5012 - fix compilation failure 2017-05-17 15:04:15 +03:00
Ana Bozianu
205b77c65d RM-5012 - generate identifier on record declare 2017-05-17 14:55:06 +03:00
Ana Bozianu
18b58d9d4c RM-5012 - fix custom identifier for non electronic records too 2017-05-17 13:34:57 +03:00
Ana Bozianu
eebecbb349 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
7590a529db RM-5012 - revert policy fix and add record aspect on first event 2017-05-16 16:21:47 +03:00
Ana Bozianu
d17121ff2c RM-5012 - fix write records created in current transaction 2017-05-16 15:53:29 +03:00
Tuna Aksoy
09d6ea5b40 RM-4528 (Electronic record using file upload creation in invalid parent container returns HTTP 500) 2017-05-16 12:54:14 +01:00
Tuna Aksoy
6971d06fc0 RM-4528 (Electronic record using file upload creation in invalid parent container returns HTTP 500) 2017-05-16 09:59:43 +01:00
Ramona Popa
2ba90b0a37 Revert "RM-5087 - when POST return minimal info" 
This reverts commit cda2da987e.
 2017-05-16 11:40:33 +03:00
Ramona Popa
cda2da987e RM-5087 - when POST return minimal info 2017-05-16 10:21:24 +03:00
Ramona Popa
4c2c1b0572 Merge branch 'master' into feature/RM-5087_UpdateNotesForGETEndpoints 2017-05-16 09:51:12 +03:00
Tuna Aksoy
8163c6753a RM-4528 (Electronic record using file upload creation in invalid parent container returns HTTP 500) 2017-05-15 22:29:33 +01:00
Tuna Aksoy
f360cb47a5 Reverted changes for RM-4528 2017-05-15 22:05:44 +01:00
Ana Bozianu
5988185459 RM-5012 - fix record folder children - 2 2017-05-15 23:31:42 +03:00
Ana Bozianu
1276e5c5c7 RM-5012 - fix record folder children 2017-05-15 23:07:07 +03:00
Ana Bozianu
edcd6f482f RM-5012 - fix some tests 2017-05-15 22:34:09 +03:00
Ramona Popa
914363aefb Merge branch 'master' into feature/RM-5087_UpdateNotesForGETEndpoints 2017-05-15 18:04:59 +03:00
Ramona Popa
264cd3e98d RM-5087 - updated include params for all endpoints 2017-05-15 18:04:29 +03:00
Tuna Aksoy
27e6f43742 Merge branch 'master' into feature/RM-4528_upload_file_in_invalid_parent_container 2017-05-15 15:28:12 +01:00
Tuna Aksoy
d0c7cdddb8 RM-4528 (Electronic record using file upload creation in invalid parent container returns HTTP 500) 2017-05-15 11:03:26 +01:00
Tuna Aksoy
1949e961ab Merge branch 'feature/RM-4564_upload_records' into 'master' 
Feature/rm 4564 upload records

See merge request !270
 2017-05-15 10:16:46 +01:00