Commit Graph

5254 Commits

Author SHA1 Message Date
Mihai Cozma
768b55cf9a Merge branch 'remotes/origin/release/V2.4' 2016-05-20 12:46:19 +03:00
Tom Page
445bbebb99 Merge release/V2.4 into master.
Conflicts:
	rm-automation/pom.xml
2016-05-20 08:23:34 +01:00
Roxana Lucanu
d2b348b9d0 Added unit test 2016-05-17 12:13:42 +03:00
Roxana Lucanu
094f64b3bb Updated version to 2.2.1.6-SNAPSHOT 2016-05-16 17:25:39 +03:00
Tom Page
c51c2713bc 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
576878b403 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
1a99c6e26b 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
f2a5f306dc Fixing the 2.4 build. Re-factoring classification dialog selectors. 2016-05-12 12:12:54 +03:00
Ana Bozianu
60e218c43b Merge release/V2.3.0.x into release/V2.3 2016-05-10 19:54:52 +03:00
Ana Bozianu
35ac5629e4 Update version to 2.3.0.6-SNAPSHOT 2016-05-10 19:54:29 +03:00
Ana Bozianu
4bc1869724 Update version to 2.3.0.5 2016-05-10 18:39:31 +03:00
Tuna Aksoy
5afce78e5c 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
871df1d9b7 Merge release/V2.3.0.x into release/V2.3 2016-05-10 16:46:32 +03:00
Ana Bozianu
fb645153b6 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 16:45:27 +03:00
Ana Bozianu
7afd921692 Revert "Update version to 2.3.0.5-SNAPSHOT"
This reverts commit 6b1c6aeb46.
2016-05-10 15:18:33 +03:00
Ana Bozianu
6b1c6aeb46 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 15:17:33 +03:00
Ana Bozianu
0d15dfce21 Update version to 2.3.0.4 2016-05-10 15:09:57 +03:00
Tuna Aksoy
5013c3f88f Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-05-09 21:57:03 +01:00
David Webster
609a28600a 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
d20d4a5f8c 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
332ced249b 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
61bf50d81c 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
6c9dba3a80 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
38a4fceadb 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
Samuel Langlois
eff49a6f37 RM-3379 Add publicapi profile to filter Javadoc 2016-05-05 15:19:56 +01:00
Kristijan Conkas
4e6b180a04 Fixes for record actions. 2016-05-05 11:56:57 +01:00
Tuna Aksoy
937219b9fb Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-05-05 11:31:47 +01:00
Tom Page
967a591e24 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
b599e7d102 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
29c8e05932 Upgrading selenium grid to 1.8. 2016-05-03 15:28:02 +03:00
Tuna Aksoy
3ebaff16ec Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-04-29 17:42:37 +01:00
Tom Page
bf2932dedb Merge master into RM-3345CantChangeOwnClearance. 2016-04-29 17:29:32 +01:00
Tom Page
537b05c53c 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
18d27da2f1 Try upgrading to 1.8 this time. 2016-04-29 16:15:54 +01:00
Tom Page
dd4c3eb407 Try upgrading selenium-grid to 1.7 to see if that fixes build. 2016-04-29 15:26:55 +01:00
Tom Page
93143fe5d6 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
7e15a0304b Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-04-28 15:39:12 +01:00
Tom Page
37dc4c7b8c 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
2a3b419ec1 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
54ad44883c RM-3276 (Edit and Application of Marks to a Single User) 2016-04-27 13:37:18 +01:00
Tom Page
3314b1737c 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
0fcc2dd1af 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
c28264c8c0 RM-2812 Finalisation of first pass of classes to annotate. 2016-04-27 09:15:37 +01:00
Tom Page
6629b10b8a 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
a7428c134f 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
Tom Page
2417ba5288 Merge release/V2.4 into master.
Conflicts:
	pom.xml
	rm-automation/pom.xml
	rm-community/pom.xml
	rm-community/rm-community-repo/pom.xml
	rm-community/rm-community-share/pom.xml
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
2016-04-25 16:22:07 +01:00
Roxana Lucanu
cc5b9ee32d RM-3300 - on versioning, document can be declared as record if adding record and version aspect is run as System 2016-04-25 11:55:53 +03:00
David Webster
575491c2a0 Version bump to 2.4.0.1-SNAPSHOT for hot fix branch 2016-04-25 09:39:44 +01:00
Jean-Pierre
c97c3881a0 [maven-release-plugin] prepare for next development iteration 2016-04-22 14:32:22 +01:00
Jean-Pierre
859f00831e [maven-release-plugin] prepare release V2.4 ags-2.4 2016-04-22 14:32:19 +01:00