Commit Graph

3908 Commits

Author SHA1 Message Date
Roy Wetherall
418b46c7c6 Purge cache when group is deleted 2017-02-01 15:48:33 +11:00
Ana Bozianu
5b041f31f2 RM-4619 - removed folder from the invalit type list 2017-01-30 22:51:31 +02:00
Ana Bozianu
5fc0cc5045 RM-4619 - moved the fileplan component check back 2017-01-30 17:03:41 +02:00
Ana Bozianu
257880cb62 Revert "RM-4619 - added the fileplan component check back but in different place"
This reverts commit e1b0e994a1.
2017-01-30 16:53:58 +02:00
Tom Page
c82b0005c6 Merge branch 'merge/localisationFixes' into 'master'
Merge/localisation fixes

See merge request !37
2017-01-30 13:37:37 +00:00
Ana Bozianu
40b61c5c62 RM-4619 - doing the conversion at first event 2017-01-30 14:35:23 +02:00
Rodica Sutu
2fd9c4fa55 Merge branch 'feature/RM-4631CreateElecRecordUpload' into 'master'
RM-4631CreateElecRecordUpload

See merge request !40
2017-01-30 11:39:03 +00:00
Rodica Sutu
3099c7235e rename the FilePlanComponentMix file to FilePlanComponentMixIn 2017-01-30 13:34:36 +02:00
Rodica Sutu
ed55ed7176 review comments 2017-01-30 13:29:05 +02:00
Ana Bozianu
e1b0e994a1 RM-4619 - added the fileplan component check back but in different place 2017-01-30 12:54:37 +02:00
Ana Bozianu
6ff8dd5846 RM-4619 - added cm:folder as accepted type and do the conversion onCommit - request doesn't have full info 2017-01-30 12:05:48 +02:00
Tom Page
808d82469e RM-4159 Create tests for paged get guides and delete guide. 2017-01-30 08:26:37 +00:00
Rodica Sutu
596eb3a937 proposed solution for creating electronic records with setting properties inside the FilePlanComponentProperties object using multipart upload 2017-01-30 09:34:34 +02:00
Ana Bozianu
088c870141 RM-4619 - moved code to existing onCommit method 2017-01-29 17:37:05 +02:00
Ana Bozianu
786fc83a71 Merge master into feature/RM-4619_AutoConvertFoldersToRMType 2017-01-29 17:25:05 +02:00
Tuna Aksoy
7abc674aad Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d 2017-01-28 20:27:16 +00:00
Tuna Aksoy
87a5859b87 RM-4617 (Update Repo/Share dependency for RM Community) 2017-01-27 17:04:16 +00:00
Tom Page
03858fe769 Merge release/V2.5 into master. 2017-01-27 14:14:57 +00:00
dbilligmaier
3dddbb7188 ALL LANG: Updated localized files as per Revision 2017-01-26 2017-01-27 13:53:30 +00:00
Kristijan Conkas
9455eb3aee Merge branch 'feature/RM-4615_TAS_Binary_Request_Handler' into 'master'
Feature/rm 4615 tas binary request handler

See merge request !32
2017-01-27 12:11:13 +00:00
Kristijan Conkas
678e3e6cf5 RM-4615: now using RM FilePlanComponentAPI calls to create electronic records. 2017-01-27 11:52:21 +00:00
Kristijan Conkas
8a875a0ef7 RM-4615: TAS version bump-up. 2017-01-27 11:16:56 +00:00
Kristijan Conkas
f79e22f253 Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-27 09:29:09 +00:00
Tuna Aksoy
91e73e2bb6 RM-4617 (Update Repo/Share dependency for RM Community) 2017-01-26 23:01:37 +00:00
Oana Nechiforescu
9461e9ee73 Merge branch 'merge/Merge25ToMasterRM-4520' into 'master'
Merge/merge25 to master rm 4520

See merge request !35
2017-01-26 16:17:44 +00:00
Rodica Sutu
8a8ff74f75 Merge branch 'feature/RM-4568CreateElecWithRelativePath' into 'master'
RM-4658

See merge request !36
2017-01-26 16:00:07 +00:00
Rodica Sutu
5df1cce895 fix the test failure 2017-01-26 17:54:23 +02:00
Rodica Sutu
bce320f548 Merge branch 'feature/RM-4568CreateElecWithRelativePath' into 'master'
Feature/rm 4568 create elec with relative path

See merge request !31
2017-01-26 15:51:49 +00:00
Rodica Sutu
0541292837 try to fix diff indentation 2017-01-26 17:50:47 +02:00
Rodica Sutu
a50450b862 formatting updates 2017-01-26 16:48:57 +02:00
Oana Nechiforescu
dae56ebaa1 Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25ToMasterRM-4520
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/src/test/java/org/alfresco/test/enterprise/level2/audit/AuditAccessOnClassifiedContent.java
2017-01-26 14:38:34 +02:00
Ana Bozianu
ca88921955 RM-4619 - fixed unit tests 2017-01-26 12:16:54 +02:00
Ana Bozianu
c84c951c52 RM-4619 - moved the conversion to the specific types before the type check 2017-01-26 12:05:17 +02:00
Kristijan Conkas
afbcdb03a8 Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-26 09:42:04 +00:00
Rodica Sutu
9fc190c5c7 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-4568CreateElecWithRelativePath 2017-01-26 11:17:43 +02:00
Tuna Aksoy
793d1ae41a RM-4617: Removed workaround 2017-01-25 17:35:00 +00:00
Oana Nechiforescu
c86d428316 Merge branch 'release/V2.4' of https://git.alfresco.com/records-management/records-management into merge-2.5/Merge24To25RM-4520 2017-01-25 18:18:17 +02:00
Kristijan Conkas
bf802dae55 Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-25 15:17:51 +00:00
Tom Page
4fac165cdb Merge branch 'feature/MNT-16881_PermissionHierarchyCheck' into 'master'
MNT-16881 Check permission hierarchy using PermissionModel.

See merge request !28
2017-01-25 15:17:34 +00:00
Kristijan Conkas
9dd7a1cf22 RM-4615: get record content implementation 2017-01-25 15:14:59 +00:00
Tuna Aksoy
c32d34fddb RM-4617: Temporary solution to fix an issue on Bamboo 2017-01-25 14:59:47 +00:00
Kristijan Conkas
d475a49c41 RM-4615: javadoc tidy-up 2017-01-25 14:45:28 +00:00
Rodica Sutu
970cf4ee06 minor updates 2017-01-25 16:26:57 +02:00
Rodica Sutu
dd5b6bd26c -remove properties block 2017-01-25 16:19:44 +02:00
Rodica Sutu
a513235bbb -add tests for the issue RM-4568 2017-01-25 16:16:33 +02:00
Tuna Aksoy
a6d2c3c9b2 Merge branch 'feature/RM-4576_Completed_records_can_be_modified' into 'master'
RM-4576 (Completed records can be modified)

See merge request !5
2017-01-25 13:42:00 +00:00
Tuna Aksoy
7f72a6da22 RM-4576 (Updated the expected status code for the case when someone tries to modify the meta data of a closed record) 2017-01-25 13:42:03 +00:00
Kristijan Conkas
45fb371de7 RM-4615: TAS implementation of FilePlanComponentAPI.createElectronicRecord() 2017-01-25 13:30:29 +00:00
Rodica Sutu
d940b065d5 -add tests for the issue RM-4568 2017-01-25 14:12:33 +02:00
Tuna Aksoy
9b9110e745 RM-4576 (Addressed review comments) 2017-01-25 12:05:15 +00:00