Commit Graph

3618 Commits

Author SHA1 Message Date
Tom Page
f15365ef21 Merge branch 'merge/RM-4234_PerformanceFixes' into 'master'
Merge/rm 4234 performance fixes

See merge request !75
2017-02-20 15:04:24 +00:00
Tom Page
a1a1c7692a RM-4234 Merge commit '131fc89' into master.
Performance improvements, including applying security marks directly to renditions rather than using the metadata
referral service.
2017-02-20 07:37:00 +00:00
Rodica Sutu
e949ab40c2 Merge branch 'feature/UpdateTasDepedency' into 'master'
Update tas dependency to the latest release version 5.2.0.4

See merge request !71
2017-02-17 12:30:17 +00:00
Ana Bozianu
0b34eb760a Merge branch 'feature/RM-4673_ConcurrentlyDeclareInPlaceRecords' into 'master'
Feature/rm 4673 concurrently declare in place records

See merge request !58
2017-02-17 11:00:13 +00:00
Rodica Sutu
7164162ef4 update tas dependency to the latest release version 2017-02-17 09:13:49 +02:00
Tom Page
9139f4228b RM-4676 The patch version number should not be localised.
Delete localisation files and exclude version.properties from future
translation bundles.
2017-02-14 10:05:25 +00:00
Ana Bozianu
c44acc37a2 RM-4673 - delete unused import 2017-02-13 19:24:20 +02:00
Ana Bozianu
eee6fe572b RM-4673 - moved try catch in the create method so we can use the group name and fixed an update attribute bug
(cherry picked from commit 9a47da1e6ff050144629ebdd1692bcf9ee35bb56)
2017-02-13 19:20:30 +02:00
Ana Bozianu
c61e180dba RM-4673 - added try catch to handle concurrent attempt to create group
(cherry picked from commit 4e49223ae6f6900b98c5c3e9fe54fe479062639d)
2017-02-13 19:20:23 +02:00
Tom Page
67cb9863f1 RM-4234 When marking a node then also mark all renditions of it.
The same applies to clearing marks from a node.

This involved adding the rendition service to the base service (which I'm
a bit concerned about, because it looked like this should already have
been present).
2017-02-10 12:10:48 +00:00
Tuna Aksoy
8a80b58593 Merge branch 'feature/RM-4585_Amend_Test_Code_After_TAS_5202_Release' into 'master'
RM-4585 (DeclareDocumentAsRecordTests: use TAS Node API when available)

See merge request !54
2017-02-10 10:52:00 +00:00
Tuna Aksoy
1b698d5a1e Merge branch 'master' into feature/RM-4585_Amend_Test_Code_After_TAS_5202_Release
Conflicts:
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java
2017-02-10 10:35:57 +00:00
Rodica Sutu
daba3ec501 Merge branch 'feature/RM-4572TestsUpdates' into 'master'
Feature/rm 4572 tests updates

See merge request !52
2017-02-10 08:29:01 +00:00
Silviu Dinuta
ecc78431c2 Merge branch 'feature/RM-4595_changingIGNodeWithFilePlanComponent_in_yaml_file' into 'master'
RM-4595: changed all ocurences of IGNode to FilePlanComponent in

See merge request !53
2017-02-10 08:07:05 +00:00
Rodica Sutu
5fe413c26d fix the compilation error 2017-02-10 09:21:33 +02:00
Tuna Aksoy
5a4fe57958 RM-4585 (DeclareDocumentAsRecordTests: use TAS Node API when available) 2017-02-09 18:03:56 +00:00
Silviu Dinuta
b1033ad999 RM-4595: changed all ocurences of IGNode to FilePlanComponent in
ig-core.yaml file
2017-02-09 18:02:06 +02:00
Rodica Sutu
1495e351b9 updates: test to cover the scenario when a cm:folder is converted to a recordCategory 2017-02-09 17:30:42 +02:00
Rodica Sutu
a35637ba09 additional checks to cover the issue RM-4572 2017-02-09 12:44:04 +02:00
Ana Bozianu
f04022c036 Merge branch 'feature/RM-4572_CreateRecordResponseContainsWrongName' into 'master'
Feature/rm 4572 create record response contains wrong name

See merge request !12
2017-02-07 14:53:36 +00:00
Ana Bozianu
86cd35e0d4 Merge branch 'feature/RM-4619_AutoConvertFoldersToRMType' into 'master'
Feature/rm 4619 auto convert folders to rm type

See merge request !33
2017-02-07 14:49:20 +00:00
Ana Bozianu
539a0a6265 RM-4619 - replaced unit tests with integration tests 2017-02-07 16:24:10 +02:00
Roy Wetherall
26f0f54e8a Revert module properties changes 2017-02-06 15:03:35 +11:00
Roy Wetherall
08cd010bc5 Purge cache when group is deleted 2017-02-01 15:48:33 +11:00
Ana Bozianu
74f168113f RM-4619 - removed folder from the invalit type list 2017-01-30 22:51:31 +02:00
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
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
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
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