Commit Graph

586 Commits

Author SHA1 Message Date
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
Tuna Aksoy
d05d0d211b RM-4564 (Record upload does not work in integration projects) 2017-05-14 19:14:45 +01:00
Ana Bozianu
f971c80a37 RM-5012 - fixed custom identifier issue 2017-05-12 18:54:31 +03:00
Ramona Popa
00bbe32229 RM-4921 - added new transaction to get the updated node in order to get the updated properties 2017-05-12 17:39:43 +03:00
Ramona Popa
8bdba24a46 Merge branch 'master' into feature/RM-4921_ExceptionsDoneOnTransactionCommit 2017-05-12 17:08:52 +03:00
Ramona Popa
01c8b33764 Merge branch 'master' into feature/RM-5087_UpdateNotesForGETEndpoints 2017-05-12 15:58:20 +03:00
Ramona Popa
a444c2d147 RM-5087 - Updated include params; added association for records 2017-05-12 15:57:26 +03:00
Ana Bozianu
1d50299bd2 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-11 11:48:21 +03:00
Ana Bozianu
aa7eeb5621 RM-5012 - fix set explicit identifier on record and ftp upload 2017-05-11 11:41:24 +03:00
Sara Aspery
82db47a3f2 Merge branch 'feature/RM-5115_FixListCatChildrenRestAPI' into 'master'
Feature/rm 5115 fix list cat children rest api

See merge request !266
2017-05-10 16:18:07 +01:00
Ramona Popa
0e39334a19 RM-5116 - added support for autoRename parameter 2017-05-10 12:05:54 +01:00
Sara Aspery
fb72bee736 RM-5115 Fixed IDE import settings following review 2017-05-10 09:27:10 +01:00
Sara Aspery
e7d5d09829 RM-5115 Changes following review 2017-05-10 07:50:33 +01:00
Sara Aspery
ab088f037e Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-5115_FixListCatChildrenRestAPI 2017-05-09 14:35:53 +01:00
Sara Aspery
9627b8ff70 RM-5115 Get category children REST API disposition schedule fix 2017-05-09 14:34:08 +01:00
Ramona Popa
c8857e16eb Merge branch 'master' into feature/RM-4921_ExceptionsDoneOnTransactionCommit 2017-05-09 14:23:05 +03:00
Ana Bozianu
1f6a96469e Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-08 17:40:28 +03:00
Ana Bozianu
89ffc3d812 RM-4921 - fix upload file to record folder and failing tests 2017-05-08 16:03:51 +03:00
Ana Bozianu
a08b4b5de1 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-08 11:11:22 +03:00
Ana Bozianu
12e6f9612c RM-4921 - enforce new transaction 2017-05-08 10:50:40 +03:00
Ana Bozianu
18a15d39be Merge master into merge/RM-4612_from_2.5_to_master 2017-05-04 21:34:34 +03:00
Ana Bozianu
c97379d1d3 Merge feature/RM-4921_ExceptionsDoneOnTransactionCommit into feature/RM-5012_recordIdentifier 2017-05-04 18:43:51 +03:00
Ramona Popa
7131793ac0 RM-4921 - use retrying transaction for all write operations: create and update 2017-05-04 18:22:56 +03:00
Ana Bozianu
83bd318948 fixed onContentUpdated node not found failure 2017-05-04 16:36:58 +03:00
Ana Bozianu
302331c59d Merge 'feature/RM-4921_ExceptionsDoneOnTransactionCommit' into feature/RM-5012_recordIdentifier 2017-05-03 22:16:53 +03:00
Ramona Popa
861875b0a9 RM-4921 - use retrying transaction for creating record category children 2017-05-03 18:06:27 +03:00
Ana Bozianu
c8a571a41c RM-5012 - added extra check to not add identifier twice 2017-05-03 17:17:18 +03:00
Ana Bozianu
447dcb800e Revert "Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master' "
This reverts commit f04022c036, reversing
changes made to 86cd35e0d4.
2017-04-28 16:57:03 +03:00
Ramona Popa
da6fcfc1b5 RM-4926 - added onRemoveAspect policy for RecordAspect 2017-04-28 13:07:22 +01:00
Ramona Popa
d52f479bc5 Merge branch 'release/V2.5' 2017-04-25 11:25:04 +03:00
Ramona Popa
c58a74a27b RM-4611 - modified integration test after review 2017-04-21 11:33:12 +03:00
Ramona Popa
d809cb7879 RM-4611 - Add policy notification implementation and integration test 2017-04-13 17:18:08 +03:00
Tuna Aksoy
b244b56e7b Feature/rm 4639 rest api refactoring 2 2017-04-12 07:36:12 +01:00
Tuna Aksoy
b8aa5b6d90 Merge branch 'release/V2.5' into merge/Merge_RM-4997
Conflicts:
	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
	rm-automation/src/test/java/org/alfresco/test/community/level2/filePlan/DestroyRecordFolderActions.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
2017-04-10 22:59:27 +01:00
Tuna Aksoy
fdb46da204 Merge branch 'release/V2.4' into merge-2.5/Merge_RM-4997 2017-04-10 21:00:28 +01:00
Tuna Aksoy
7ff3891856 Fixed failing UI tests 2017-04-10 20:58:10 +01:00