Commit Graph

1065 Commits

Author SHA1 Message Date
Tuna Aksoy
0a578fc91f Changed line ending to Unix 2016-07-01 23:07:32 +01:00
Tuna Aksoy
3615bbda60 Fixed line endings 2016-07-01 23:03:43 +01:00
Tuna Aksoy
d8bf1acb9c Fixed audit log issue 2016-07-01 22:56:45 +01:00
Tuna Aksoy
4702b6fe60 RM 2.5 + Alfresco 5.1.1 2016-07-01 22:24:50 +01:00
Tuna Aksoy
021a1077b0 RM 2.5 + Alfresco 5.1.1 2016-07-01 17:14:27 +01:00
Roxana Lucanu-Ghetu
07227ed9e0 Called the method to test inside another transaction. 2016-06-30 12:00:23 +03:00
Tom Page
361d77532e Merge release/V2.5-EA1 into master. 2016-06-29 14:13:45 +01:00
Roy Wetherall
54b2c446e2 Merge branch 'feature-2.4/RM-3227-Merge2V2.4' into 'release/V2.4'
Feature 2.4/rm 3227 merge2 v2.4

Merge RM-3227 from 2.3 to 2.4

See merge request !283
2016-06-29 10:41:45 +01:00
Roy Wetherall
9ff616467e Missing license headers 2016-06-29 14:34:39 +10:00
Roy Wetherall
850783b64a Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
dc933bc80c Merge branch 'feature/RM-3286' into 'master'
Feature/rm 3286

Merge into master

See merge request !281
2016-06-28 21:28:59 +01:00
Roxana Lucanu-Ghetu
5de8289725 Merge branch 'feature/RM-3060_mergeToMaster' into 'master'
Feature/rm 3060 merge to master

Merge fix for record with multiple dispositions.

See merge request !280
2016-06-28 21:26:58 +01:00
alfresco-build
2dd28a6ac2 [maven-release-plugin] prepare for next development iteration 2016-06-28 17:59:26 +01:00
alfresco-build
ac4460ee9e [maven-release-plugin] prepare release V2.5-EA1 2016-06-28 17:59:23 +01:00
Roxana Lucanu-Ghetu
c459c10e68 Merge RM-3286 2016-06-28 14:52:30 +03:00
Roxana Lucanu-Ghetu
f38f4b24f6 Merge RM-3060 into master 2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
ee428af92f Merge commit '5f8225360a1f322d2522171edc04aa7a54da41b3' into feature/RM-3300_mergeToMaster 2016-06-28 11:39:49 +03:00
Mihai Cozma
006f46dc74 Revert dispositionlifecycletrigger to 0 0/5 * * * ? 2016-06-28 11:28:01 +03:00
Roxana Dina
7fd7cf10f3 RM-3265 Disable "Move" action for closed record folder. Change the
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
2016-06-27 17:41:13 +03:00
Roxana Lucanu-Ghetu
3c67dc14f5 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-3300_mergeToMaster 2016-06-27 16:58:24 +03:00
Roxana Lucanu-Ghetu
1c7a84e481 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Tom Page
e25ff1c64a Merge feature/RM-3341_MergeToMaster into Everything. 2016-06-24 17:25:38 +01:00
Roxana Lucanu-Ghetu
e687fa40cf Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

See merge request !271
2016-06-24 15:46:34 +01:00
Roxana Lucanu-Ghetu
5f8225360a no message 2016-06-24 17:43:52 +03:00
Mihai Cozma
0ff85ba446 Merge branch 'feature-2.4/RM-3293_Audit_not_log_default_scheduled' into 'release/V2.4'
Feature 2.4/rm 3293 audit not log default scheduled

See merge request !242
2016-06-24 15:24:52 +01:00
Mihai Cozma
9d235a8286 Merge commit 'af7fe8' into RM-3341_MergeToMaster 2016-06-24 17:03:11 +03:00
Mihai Cozma
84d352754b Merge commit '4d7581' into RM-3426_MergeToMaster 2016-06-24 16:54:11 +03:00
Roxana Lucanu-Ghetu
c4c238c439 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

Run code as system

See merge request !265
2016-06-24 14:46:38 +01:00
Roxana Lucanu-Ghetu
7e31be2d52 Merge commit '5c8cc6fef25bd8b37724ee09a7fbfc210f9db2f7' into RM-3300_mergeToMaster
RM-3300
2016-06-24 13:47:15 +03:00
Roxana Lucanu-Ghetu
00bb21a0fd Merge commit '51c7b1b59cb47bb4dd61a32ebf8defc1d698fd87' into RM-3300_mergeToMaster
RM-3300
2016-06-24 13:45:50 +03:00
Roxana Lucanu-Ghetu
e94ba209c1 Merge commit '56190f0cb11840ae1d773fbd53ced19111ea7535' into RM-3300_mergeToMaster
RM-3300
2016-06-24 13:41:08 +03:00
Roxana Lucanu-Ghetu
b626bfd888 Run the code as system, as some users may not have the rights to add the aspect. 2016-06-24 12:08:41 +03:00
Tom Page
2d539f639d RM-3566 Update security controls API.
Create a Java API to allow adding and removing specified security controls
without affecting other marks on the node.
2016-06-23 15:05:15 +01:00
Mihai Cozma
bf83f34716 RM-3293 RM Audit History does not log 2016-06-23 12:10:06 +03:00
Roxana Dina
f3663bcd58 RM-3265 Add test for the Move action on a destroyed record folder. 2016-06-22 20:27:26 +03:00
Roxana Dina
39ee6e9c02 Merge remote-tracking branch 'origin/feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into release/V2.4 2016-06-17 17:28:17 +03:00
Roxana Dina
3d8f609c4c Change capability condition name. Add comments and version number. 2016-06-17 16:32:43 +03:00
Roxana Lucanu-Ghetu
4bb4783705 Changed check to throw exception when we try to create records from different types other than cm:folder 2016-06-17 12:25:22 +03:00
Roxana Lucanu-Ghetu
8f692811f9 Merge branch 'feature-2.4/RM-3286' into 'release/V2.4'
Feature 2.4/rm 3286

Changed behavior:is not possible to create a record folder inside another record folder from IMAP client.
When adding emails with attachments from Outlook client a hidden folder is created inside the record folder, to store the attachments.

See merge request !214
2016-06-17 10:06:43 +01:00
Roxana Lucanu-Ghetu
db390cfb8c Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +03:00
Roxana Lucanu-Ghetu
d9883a3b02 Merge branch 'feature-2.4/RM-3060' into 'release/V2.4'
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157
2016-06-17 08:25:27 +01:00
Roxana Lucanu-Ghetu
b1db2fcd04 Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. 2016-06-16 15:50:35 +03:00
Roxana Dina
28551bb78a rm-3265 Add new capability condition to deal with displaying the "Move" action. 2016-06-16 14:00:28 +03:00
Mihai Cozma
69a20b7adf RM-3293 RM Audit History does not log Cutoff 2016-06-15 15:42:11 +03:00
Roxana Lucanu-Ghetu
70f3071f39 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

On versioning, document can be declared as record if adding record and version aspect is done running as System.
I noticed that the aspect is added only like this in other places where it is used; and the method for creating new recorded version, where the aspect is added, is not used in other places such that changing behavior elsewhere.

See merge request !152
2016-06-15 10:19:48 +01:00
Roxana Lucanu-Ghetu
5c8cc6fef2 Changed to BehaviourDrivenTest to be more obvious the steps and what is checked. 2016-06-15 12:01:47 +03:00
Roxana Lucanu-Ghetu
96142085d8 Throw exception when trying to create records from different types other than cm:content 2016-06-14 12:27:17 +03:00
Roy Wetherall
36b6916a88 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
Tom Page
ee96a03075 Merge branch 'feature/WebScriptUtilsCapitalisation' into 'master'
Feature/web script utils capitalisation

Fix capitalisation in a few method names in WebScriptUtils.

This also provides an opportunity to test whether the mirroring script works, as this includes changes to community files.

See merge request !218
2016-06-08 17:16:57 +01:00
Mihai Cozma
f7b0589371 Merge branch 'feature-2.4/RM-3341_Emails_can_be_added_to_the_HoldsTransfers' into 'release/V2.4'
Feature 2.4/rm 3341 emails can be added to the holds transfers

See merge request !217
2016-06-08 12:34:11 +01:00