Commit Graph

3433 Commits

Author SHA1 Message Date
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
Kristijan Conkas
ffa9298f40 Merge remote-tracking branch 'origin/master' into feature/RM-3471_Fix_Latest_Aikau_Tests 2016-06-14 09:52:15 +01:00
David Webster
7de55303a7 Merge remote-tracking branch 'origin/feature/RM-3134_caveat_package_rename' 2016-06-10 22:28:49 +01:00
Kristijan Conkas
79e2815032 RM-3471: Fix for ClassifyContentDialog + HtmlElements bump-up 2016-06-10 10:04:42 +01:00
Roy Wetherall
36b6916a88 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
David Webster
aed5bd3b57 RM-3134: Fix community build - delete files not deleted by previous revert 2016-06-08 19:36:13 +01: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
David Webster
fb23e6f276 RM-3134: Revert change to rm-community caveat code as legacy feature isn't being renamed 2016-06-08 10:05:02 +01:00
David Webster
9442cfc103 RM-3134: Rename caveat package securitymarks 2016-06-07 15:46:50 +01:00
Tom Page
80bb28d782 Refactor WebScriptUtils to have consistent capitalisation of JSON.
Also fix capitalisation in putValuetoJSONObject (so that it's now
putValueToJSONObject).
2016-06-06 14:55:56 +01:00
Mihai Cozma
c429005c33 RM-3341 - Outlook Integrations:Emails can be added to the Holds
/Transfers from Outlook Integration
2016-06-06 11:21:51 +03:00
Roxana Lucanu-Ghetu
b372ff0900 Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00
Roxana Lucanu-Ghetu
8d8f5fb5c3 Added check to allow creating only records inside a record folder. 2016-06-03 11:10:18 +03:00
Roxana Lucanu-Ghetu
841c21df80 Changed test class and commented initial fix. 2016-06-01 17:41:36 +03:00
Mihai Cozma
7cb56b5c5c Create Hold and Transfer container exception 2016-05-31 18:16:32 +03:00
Roxana Lucanu-Ghetu
b5154530c5 Added integration test. 2016-05-31 14:50:27 +03:00
Tuna Aksoy
214c4f7e0d RM-3426 (Number of artifacts for the RM Enterprise project - Update configuration) 2016-05-23 12:03:00 +01:00
Mihai Cozma
e9df727bb1 Merge remote-tracking branch 'origin/master' into feature/Merge2.4ToMaster 2016-05-20 17:19:49 +03:00
Mihai Cozma
8db0b0cfdb Merge commit '33f978' into feature/Merge2.4ToMaster 2016-05-20 15:33:55 +03:00
Tom Page
36c8f7ad00 Merge release/V2.4 into Merge2.4ToMaster.
Conflicts:
	rm-community/rm-community-repo/pom.xml
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2016-05-20 11:53:58 +01:00
Tom Page
5ea7870048 Merge release/V2.4 into Merge2.4ToMaster.
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties
2016-05-20 11:51:28 +01:00
Mihai Cozma
6db35611c2 Merge branch 'remotes/origin/release/V2.4' 2016-05-20 12:46:19 +03:00
Tom Page
d692782311 Merge release/V2.4 into master.
Conflicts:
	rm-automation/pom.xml
2016-05-20 08:23:34 +01:00
Roxana Lucanu
51c7b1b59c Added unit test 2016-05-17 12:13:42 +03:00
Roxana Lucanu
22d7efe18f Updated version to 2.2.1.6-SNAPSHOT 2016-05-16 17:25:39 +03:00
Tom Page
500f127b93 Merge branch 'feature/RM-3369_TestSetClearance' into 'master'
Feature/rm 3369 test set clearance

RM-3369 Fix several existing security clearance UI tests.

Use the in-line "Set Clearance" action on the security clearance page and expect the new dialog to
pop up (rather than the dropdown menu that used to be there).

Remove a check on the ordering of the classification levels in the security marks dialog, because
there is now a new issue (RM-3416) to cover this.

Note that this does not cover all acceptance criteria for RM-3010 because the "on-hover"
functionality has not yet been implemented.

See merge request !180
2016-05-16 09:21:41 +01:00
Tom Page
19781d1061 RM-3369 Make h2 sort case insensitively.
This fix means that sorting-based tests will pass locally as well as on
Bamboo. Revert the previous change to the loadSecurityClearancePage test.
2016-05-13 14:29:19 +01:00
Oana Nechiforescu
7ae48c63b6 Merge branch 'feature/RM-3362_FixTheBuild' into 'master'
Feature/rm 3362 fix the build

See merge request !173
2016-05-12 12:35:28 +01:00
onechiforescu
fb59273b19 Fixing the 2.4 build. Re-factoring classification dialog selectors. 2016-05-12 12:12:54 +03:00
Ana Bozianu
f237862373 Merge release/V2.3.0.x into release/V2.3 2016-05-10 19:54:52 +03:00
Ana Bozianu
a9d32dd8f0 Update version to 2.3.0.6-SNAPSHOT 2016-05-10 19:54:29 +03:00
Ana Bozianu
fe79f0362f Update version to 2.3.0.5 2016-05-10 18:39:31 +03:00
Tuna Aksoy
cfae4e676f Merge branch 'feature/RM-2868_Create_Mark_Selection_Widget' into 'master'
Feature/rm 2868 create mark selection widget

See merge request !141
2016-05-10 14:47:23 +01:00
Ana Bozianu
da444d4df6 Merge release/V2.3.0.x into release/V2.3 2016-05-10 16:46:32 +03:00
Ana Bozianu
9f00a4c821 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 16:45:27 +03:00
Ana Bozianu
84d63650c1 Revert "Update version to 2.3.0.5-SNAPSHOT"
This reverts commit e901666d3f.
2016-05-10 15:18:33 +03:00
Ana Bozianu
e901666d3f Update version to 2.3.0.5-SNAPSHOT 2016-05-10 15:17:33 +03:00
Ana Bozianu
8372b82d42 Update version to 2.3.0.4 2016-05-10 15:09:57 +03:00
Tuna Aksoy
d525e377b5 Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-05-09 21:57:03 +01:00
David Webster
bc48a60c55 Merge branch 'feature-2.4/RM-3325_pom_descriptions' into 'release/V2.4'
Feature 2.4/rm 3325 pom descriptions

See merge request !144
2016-05-09 10:55:16 +01:00
David Webster
1681744abb Merge remote-tracking branch 'origin/release/V2.4' into feature-2.4/RM-3325_pom_descriptions 2016-05-09 10:53:43 +01:00