summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-28 00:39:23 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-28 00:39:23 +0100
commit02414dc53b2f932d0477ef03d3913bc12ff924dd (patch)
tree1d008bd9d44ed7c1fbb42434f61aea7b77e4571b /template/en
parent2fdfa60f167cbbee507351fba19c8e01880d9ae6 (diff)
parenta8fd4c69ba96a7f751859db566bda85142e0beb2 (diff)
downloadbugzilla-02414dc53b2f932d0477ef03d3913bc12ff924dd.tar.gz
bugzilla-02414dc53b2f932d0477ef03d3913bc12ff924dd.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/bug/dependency-tree.html.tmpl4
-rw-r--r--template/en/default/pages/release-notes.html.tmpl12
2 files changed, 10 insertions, 6 deletions
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 6ae183f1f..10279f9b2 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -64,14 +64,14 @@
[% IF ids.size %]
depends on
[% ELSE %]
- does not depend on any [% terms.bugs %].
+ does not depend on any [% 'open ' IF hide_resolved %][% terms.bugs %].
[% END %]
[% ELSIF type == 2 %]
[% tree_name = "blocked_tree" %]
[% IF ids.size %]
blocks
[% ELSE %]
- does not block any [% terms.bugs %].
+ does not block any [% 'open ' IF hide_resolved %][% terms.bugs %].
[% END %]
[% END %]
[% IF ids.size %]
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 41396f5ac..03df6911c 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -95,7 +95,7 @@
[% INCLUDE req_table reqs = OPTIONAL_MODULES
new = ['Encode', 'Encode-Detect']
- updated = ['PatchReader']
+ updated = ['PatchReader', 'Apache-SizeLimit']
include_feature = 1 %]
<h3 id="v42_req_apache">Optional Apache Modules</h3>
@@ -218,6 +218,10 @@
dependencies is now much faster.</li>
<li><strong>Attachments:</strong> The encoding of text files can be automatically
detected when uploading them as attachments.</li>
+ <li><strong>Attachments:</strong> Clickjacking could possibly occur in an attachment
+ Details page if a user attached a specially formatted HTML file. To fix this
+ potential problem, the Details page always displays the HTML source instead and
+ users can see rendered page by clicking on View.</li>
<li><strong>Flags:</strong> Changing the requestee of a flag no longer changes
the requester.</li>
<li><strong>Reports:</strong> If JavaScript is enabled in your web browser,
@@ -425,7 +429,7 @@
release:</p>
<ul>
- <li>The <kdb>B[% %]ug.create</kdb> WebService method now throws an error if you
+ <li>The <kbd>B[% %]ug.create</kbd> WebService method now throws an error if you
pass a group name which doesn't exist. In [% terms.Bugzilla %] 4.0 and 4.0.1,
this group name was silently ignored, leaving your [% terms.bug %] unsecure
if no other group applied.
@@ -436,7 +440,7 @@
(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=663208">[% terms.Bug %] 663208</a>)</li>
<li>Marking [% terms.abug %] as a duplicate now works in Internet Explorer 9.
(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=656769">[% terms.Bug %] 656769</a>)</li>
- <li><kdb>importxml.pl</kdb> no longer crashes when importing keywords (regressed
+ <li><kbd>importxml.pl</kbd> no longer crashes when importing keywords (regressed
in 4.0).
(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=657707">[% terms.Bug %] 657707</a>)</li>
<li>Data entered while reporting a new [% terms.bug %] could be lost if you had
@@ -449,7 +453,7 @@
<li>The XML-RPC interface now works with SOAP::Lite 0.711 and 0.712 under mod_perl.
(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=600810">[% terms.Bug %] 600810</a>)</li>
<li>LWP 6.00 and newer require Perl 5.8.8 and above. When installing this module
- using <kdb>install-module.pl</kdb> on a Perl installation older than 5.8.8,
+ using <kbd>install-module.pl</kbd> on a Perl installation older than 5.8.8,
LWP 5.837 will be installed instead.
(<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=655912">[% terms.Bug %] 655912</a>)</li>
<li>Viewing [% terms.abug %] report should be significantly faster when your