Commit Graph

2759 Commits

Author SHA1 Message Date
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
ccesarini
7862dff0fb DUTCH: Updated bundle for RM 2.4 based on EN-rev2016-05-06 ("Content Management System" has been translated) 2016-05-06 17:04:26 +01:00
ccesarini
fcac723b58 GERMAN: Updated bundle for RM 2.4 based on EN-rev2016-05-06 (some terms have been translated) 2016-05-06 16:45:00 +01:00
ccesarini
af5fc8e59e GERMAN: Updated bundle for RM 2.5 based on EN-rev2016-05-04 (some terms have been translated) 2016-05-06 15:57:00 +01:00
ccesarini
091e77269a DUTCH: Updated bundle for RM 2.5 based on EN-rev2016-05-04 (Content Management System has been translated) 2016-05-06 15:21:27 +01:00
Kristijan Conkas
8cecdb50a4 Fixes for record actions. 2016-05-05 11:56:57 +01:00
Tuna Aksoy
fdf71a5885 Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-05-05 11:31:47 +01:00
Tom Page
e566e745e1 Merge branch 'xperimental/RM-2812_PublicAPITest' into 'master'
Xperimental/rm 2812 public api test

A unit test to look for compatibility issues within the classes marked public API. The test will fail if it finds any exposed references to Alfresco non-public API classes from those marked as @AlfrescoPublicApi. The test searches within method signatures, fields, constructors, superclasses, inner classes and interfaces of public API classes.

See merge request !158
2016-05-05 08:22:33 +01:00
Tom Page
c8b766afcd RM-2812 Incompatibility in deprecated methods is still a problem.
Remove the checks for deprecation, because deprecated methods/classes may
still be used.
2016-05-04 14:34:18 +01:00
onechiforescu
a4a8e17527 Upgrading selenium grid to 1.8. 2016-05-03 15:28:02 +03:00
Tuna Aksoy
17083dcaf5 Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-04-29 17:42:37 +01:00
Tom Page
37aa1fe78a Merge master into RM-3345CantChangeOwnClearance. 2016-04-29 17:29:32 +01:00
Tom Page
469d688347 Merge branch 'feature/UpgradeSeleniumGrid' into 'master'
Feature/upgrade selenium grid

Selenium-grid 1.8 allows the UI tests to run on the Bamboo servers.

See merge request !165
2016-04-29 16:59:48 +01:00
Tom Page
f0865516fb Try upgrading to 1.8 this time. 2016-04-29 16:15:54 +01:00
Tom Page
abc853863f Try upgrading selenium-grid to 1.7 to see if that fixes build. 2016-04-29 15:26:55 +01:00
Tom Page
80c18004cd RM-3345 Ensure the current user is not setting their own clearance.
Also add unit tests for admin losing clearance and guest gaining clearance.
2016-04-29 10:07:04 +01:00
Tuna Aksoy
40651b50ed Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-04-28 15:39:12 +01:00
Tom Page
f5b33d003d Merge branch 'feature/RM-3344_AdminAndGuest' into 'master'
Feature/rm 3344 admin and guest

RM-3344 Ensure that admin can't lose clearance and guest can't gain any clearance.

Rather than use the guest role, as was used previously for classification clearance, we are
explicitly checking the username.

See merge request !160
2016-04-28 10:00:23 +01:00
Tom Page
6f8fecae4b RM-3344 Ensure we are not downgrading admin or upgrading guest.
This is a first pass at preventing changes to the clearance of admin or guest.
Previously we weren't allowing any changes to their clearance, but when
working with security markings, admin in particular needs to occasionally gain
a new mark when a custom group is created.  Currently that clearing is not
happening, but this change does not prevent it, if needed.

Also remove an unused method from the CaveatMarkingServiceImpl, as the class
is already very full.
2016-04-27 16:12:11 +01:00
Tuna Aksoy
2a0b8d46a8 RM-3276 (Edit and Application of Marks to a Single User) 2016-04-27 13:37:18 +01:00
Tom Page
4d14d17fb4 Merge branch 'xperimental/RM-2812_MarkPublicAPIs' into 'master'
Xperimental/rm 2812 Mark Public APIs

First attempt to mark classes that should be part of the public API with \@AlfrescoPublicAPI.

I have also added a couple of \@deprecated annotations to classes where I thought it made sense, and
added comments to classes that I wanted to add to the public API but couldn't (due to their contract
being dependent on non-public API classes).

See merge request !138
2016-04-27 09:23:58 +01:00
Tom Page
04cac7b9e7 Public API consistency tests.
Check that the classes we've declared as AlfrescoPublicApi do not require
use of non-public API Alfresco classes.
2016-04-27 09:18:08 +01:00
Tom Page
365090abdf RM-2812 Finalisation of first pass of classes to annotate. 2016-04-27 09:15:37 +01:00
Tom Page
46b1a54dff Merge branch 'feature/RM-3144_PatchForClearanceLevel' into 'master'
Feature/rm 3144 patch for clearance level

Create a patch to migrate all users' clearance levels from the old classification model to
the new security marks model.

This merge request depends on getting !130 merged first.

See merge request !133
2016-04-27 08:27:12 +01:00
Roxana Lucanu
1c7e75c1b3 RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule 2016-04-26 18:06:11 +03:00