Git commit 289da52418bb70b2ae788d94d52615b7f1128517 by Ingo Malchow. Committed on 01/04/2013 at 00:26. Pushed by imalchow into branch 'develop'. integrate upstream template changes M +3 -0 template/en/custom/admin/params/groupsecurity.html.tmpl M +1 -1 template/en/custom/bug/create/create.html.tmpl M +1 -0 template/en/custom/bug/field-events.js.tmpl M +1 -1 template/en/custom/bug/field-help.none.tmpl M +1 -1 template/en/custom/global/header.html.tmpl M +5 -0 template/en/custom/global/user-error.html.tmpl M +33 -0 template/en/custom/pages/release-notes.html.tmpl http://commits.kde.org/websites/bugs-kde-org/289da52418bb70b2ae788d94d52615= b7f1128517 diff --git a/template/en/custom/admin/params/groupsecurity.html.tmpl b/temp= late/en/custom/admin/params/groupsecurity.html.tmpl index ab39a91..f4d6a5a 100644 --- a/template/en/custom/admin/params/groupsecurity.html.tmpl +++ b/template/en/custom/admin/params/groupsecurity.html.tmpl @@ -41,6 +41,9 @@ = querysharegroup =3D> "The name of the group of users who can share their= " _ "saved searches with others.", + = + debug_group =3D> "The name of the group of users who can view the actual = " _ + "SQL query generated when viewing $terms.bug lists and re= ports.", = usevisibilitygroups =3D> "Do you wish to restrict visibility of users to= members of " _ "specific groups?", diff --git a/template/en/custom/bug/create/create.html.tmpl b/template/en/c= ustom/bug/create/create.html.tmpl index 9e25229..3edfa31 100644 --- a/template/en/custom/bug/create/create.html.tmpl +++ b/template/en/custom/bug/create/create.html.tmpl @@ -301,7 +301,7 @@ TUI_hide_default('attachment_text_field'); bug =3D default, field =3D bug_fields.op_sys, editable =3D 1, = value =3D default.op_sys %] - [% IF !Param('defaultplatform') || !Param('defaultopsys') %] + [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_b= ug_id %]   diff --git a/template/en/custom/bug/field-events.js.tmpl b/template/en/cust= om/bug/field-events.js.tmpl index ccc9f52..e31c72a 100644 --- a/template/en/custom/bug/field-events.js.tmpl +++ b/template/en/custom/bug/field-events.js.tmpl @@ -54,6 +54,7 @@ [% FOREACH controlled_field =3D legal_value.controlled_values.keys %] [% SET cont_ids =3D [] %] [% FOREACH val =3D legal_value.controlled_values.$controlled_field %] + [% NEXT IF !val.is_active %] [% cont_ids.push(val.id) %] [% END %] [% NEXT IF !cont_ids.size %] diff --git a/template/en/custom/bug/field-help.none.tmpl b/template/en/cust= om/bug/field-help.none.tmpl index 7ae9991..a9449fb 100644 --- a/template/en/custom/bug/field-help.none.tmpl +++ b/template/en/custom/bug/field-help.none.tmpl @@ -91,7 +91,7 @@ estimated_time =3D> = keywords =3D> "You can add keywords from a defined list to $terms.bugs, in order" - _ " to tag and group them.", + _ " to easily identify and group them.", = longdesc =3D> "$terms.Bugs have comments added to them by $terms.Bugzilla users." diff --git a/template/en/custom/global/header.html.tmpl b/template/en/custo= m/global/header.html.tmpl index 3a0e4d0..56b0d15 100644 --- a/template/en/custom/global/header.html.tmpl +++ b/template/en/custom/global/header.html.tmpl @@ -240,7 +240,7 @@ # but set the onload attribute in the DEFAULT directive above. #%] diff --git a/template/en/custom/global/user-error.html.tmpl b/template/en/c= ustom/global/user-error.html.tmpl index 93f03c2..2e76f91 100644 --- a/template/en/custom/global/user-error.html.tmpl +++ b/template/en/custom/global/user-error.html.tmpl @@ -1638,6 +1638,11 @@ [% ELSIF error =3D=3D "unknown_tab" %] [% title =3D "Unknown Tab" %] [% current_tab_name FILTER html %] is not a legal tab nam= e. + = + [% ELSIF error =3D=3D "value_inactive" %] + [% title =3D "Value is Not Active" %] + [% type =3D BLOCK %][% INCLUDE object_name class =3D class %][% END %] + The [% type FILTER html %] value '[% value FILTER html %]' is not acti= ve. = [% ELSIF error =3D=3D "version_already_exists" %] [% title =3D "Version Already Exists" %] diff --git a/template/en/custom/pages/release-notes.html.tmpl b/template/en= /custom/pages/release-notes.html.tmpl index 469305c..fdf0340 100644 --- a/template/en/custom/pages/release-notes.html.tmpl +++ b/template/en/custom/pages/release-notes.html.tmpl @@ -53,6 +53,39 @@ =

Updates in this 4.2.x Release

= +h3>4.2.5 + +

This release fixes one security issue. See the + Security Advisory + for details.

+ +

In addition, the following important fixes/changes have been made in th= is + release:

+ + +

4.2.4

=

This release fixes several security issues. See the