Ana Bozianu
249705c21f
RM-4619 - moved the fileplan component check back
2017-01-30 17:03:41 +02:00
Ana Bozianu
6c2f58e734
Revert "RM-4619 - added the fileplan component check back but in different place"
...
This reverts commit abfc606428
2017-01-30 16:53:58 +02:00
Tom Page
aa6aff975f
Merge branch 'merge/localisationFixes' into 'master'
...
Merge/localisation fixes
See merge request !37
2017-01-30 13:37:37 +00:00
Ana Bozianu
d0401ea569
RM-4619 - doing the conversion at first event
2017-01-30 14:35:23 +02:00
Rodica Sutu
bf10af5947
Merge branch 'feature/RM-4631CreateElecRecordUpload' into 'master'
...
RM-4631CreateElecRecordUpload
See merge request !40
2017-01-30 11:39:03 +00:00
Rodica Sutu
e5ea438e45
rename the FilePlanComponentMix file to FilePlanComponentMixIn
2017-01-30 13:34:36 +02:00
Rodica Sutu
6b21216195
review comments
2017-01-30 13:29:05 +02:00
Ana Bozianu
abfc606428
RM-4619 - added the fileplan component check back but in different place
2017-01-30 12:54:37 +02:00
Ana Bozianu
c52e2a7cf5
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
7a0a0954e9
RM-4159 Create tests for paged get guides and delete guide.
2017-01-30 08:26:37 +00:00
Rodica Sutu
63c22d5d4f
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
444218a539
RM-4619 - moved code to existing onCommit method
2017-01-29 17:37:05 +02:00
Ana Bozianu
f6722b634c
Merge master into feature/RM-4619_AutoConvertFoldersToRMType
2017-01-29 17:25:05 +02:00
Tuna Aksoy
68420493b0
Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d
2017-01-28 20:27:16 +00:00
Tuna Aksoy
a9be95d781
RM-4617 (Update Repo/Share dependency for RM Community)
2017-01-27 17:04:16 +00:00
Tom Page
9af7b7c11a
Merge release/V2.5 into master.
2017-01-27 14:14:57 +00:00
dbilligmaier
90c8c28168
ALL LANG: Updated localized files as per Revision 2017-01-26
2017-01-27 13:53:30 +00:00
Kristijan Conkas
723ee7193b
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
8e1cc5aebd
RM-4615: now using RM FilePlanComponentAPI calls to create electronic records.
2017-01-27 11:52:21 +00:00
Kristijan Conkas
0ce70b50da
RM-4615: TAS version bump-up.
2017-01-27 11:16:56 +00:00
Kristijan Conkas
d2e6dac35c
Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler
2017-01-27 09:29:09 +00:00
Tuna Aksoy
385d6fca1d
RM-4617 (Update Repo/Share dependency for RM Community)
2017-01-26 23:01:37 +00:00
Oana Nechiforescu
eef879a140
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
ed800f4ced
Merge branch 'feature/RM-4568CreateElecWithRelativePath' into 'master'
...
RM-4658
See merge request !36
2017-01-26 16:00:07 +00:00
Rodica Sutu
4cd4501efa
fix the test failure
2017-01-26 17:54:23 +02:00
Rodica Sutu
3e66cb5974
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
e0f29cfaa2
try to fix diff indentation
2017-01-26 17:50:47 +02:00
Rodica Sutu
aea517f0f7
formatting updates
2017-01-26 16:48:57 +02:00
Oana Nechiforescu
a6a8da3506
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
df919acfc7
RM-4619 - fixed unit tests
2017-01-26 12:16:54 +02:00
Ana Bozianu
f1d6e5a7b6
RM-4619 - moved the conversion to the specific types before the type check
2017-01-26 12:05:17 +02:00
Kristijan Conkas
c62789af8e
Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler
2017-01-26 09:42:04 +00:00
Rodica Sutu
3d93d4e55d
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
e604d2baa9
RM-4617: Removed workaround
2017-01-25 17:35:00 +00:00
Oana Nechiforescu
8203748823
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
b4f43e2eee
Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler
2017-01-25 15:17:51 +00:00
Tom Page
3ac2ffc1ae
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
3e947a89c8
RM-4615: get record content implementation
2017-01-25 15:14:59 +00:00
Tuna Aksoy
eec77c5a49
RM-4617: Temporary solution to fix an issue on Bamboo
2017-01-25 14:59:47 +00:00
Kristijan Conkas
031ceb6010
RM-4615: javadoc tidy-up
2017-01-25 14:45:28 +00:00
Rodica Sutu
6003e223ff
minor updates
2017-01-25 16:26:57 +02:00
Rodica Sutu
1ac49eed78
-remove properties block
2017-01-25 16:19:44 +02:00
Rodica Sutu
81bc3bae94
-add tests for the issue RM-4568
2017-01-25 16:16:33 +02:00
Tuna Aksoy
827da44cb3
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
2d0b08ab93
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
5343bbd556
RM-4615: TAS implementation of FilePlanComponentAPI.createElectronicRecord()
2017-01-25 13:30:29 +00:00
Rodica Sutu
acb4570b75
-add tests for the issue RM-4568
2017-01-25 14:12:33 +02:00
Tuna Aksoy
9691885b92
RM-4576 (Addressed review comments)
2017-01-25 12:05:15 +00:00
Kristijan Conkas
dcffcf8c3e
RM-4615: removed hardcoding
2017-01-25 11:32:12 +00:00
Tom Page
c7aaa7b2e9
RM-4159 Wrap the RestWrapper rather than extending it.
...
Previously we were hitting an issue where there were three beans all of the
type RestWrapper. This meant that Spring could not determine which bean
should be used when autowiring. By wrapping the RestWrapper we ensure there
is only one bean of that type, and so Spring knows which bean to use (in the
TAS code). After some debate I decided against renaming the RMRestWrapper
as RestWrapperWrapper.
2017-01-25 11:07:11 +00:00
