summaryrefslogtreecommitdiffstats
path: root/extensions/BMO/template/en/default/pages
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/BMO/template/en/default/pages')
-rw-r--r--extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl53
-rw-r--r--extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl2
-rw-r--r--extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl16
-rw-r--r--extensions/BMO/template/en/default/pages/user_activity.html.tmpl2
4 files changed, 10 insertions, 63 deletions
diff --git a/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl b/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl
deleted file mode 100644
index 18b7a3f60..000000000
--- a/extensions/BMO/template/en/default/pages/persona_deprecated.html.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- #
- # This Source Code Form is "Incompatible With Secondary Licenses", as
- # defined by the Mozilla Public License, v. 2.0.
- #%]
-
-[% PROCESS global/header.html.tmpl
- title = "Persona Deprecated"
-%]
-
-<h2>Persona Deprecated</h2>
-
-<p>
- Beginning on October 25th, 2016, <a href="https://login.persona.org">Persona</a> is no longer a supported authentication method
- for bugzilla.mozilla.org (BMO). The Mozilla supported Persona service will cease operations on November 30th, 2016 so therefore
- BMO will not longer be able to use the service for authentication. You can go
- <a href="https://wiki.mozilla.org/Identity/Persona_Shutdown_Guidelines_for_Reliers">here</a> for more information about Persona
- and the reasons for shutting down service.
-</p>
-
-<p>
- For users of Persona on BMO, there are two other methods for authentication that are supported and you will need to switch
- over to one of them after your current session expires starting October 25th, 2016.
-</p>
-
-<h3>Native Login</h3>
-
-<p>
- BMO has always supported native authentication using a password securely stored in our database. If you have used Persona since
- first creating your BMO account, you will probably not know this password. But you can reset it to something you do know by first
- logging out, and then clicking on 'Forgot Password' at the right-hand top of the page. Enter your email you used with Persona in
- the text field and click 'Reset Password'.
-</p>
-
-<p>
- You will receive an email with a link you can use to reset your current password to something you can use from now on.
- After you reset your password, simply enter your login and the password in the login fields at the top of any BMO page.
-</p>
-
-<h3>Github Login</h3>
-
-<p>
- <a href="https://github.com">Github</a> is also a BMO supported method of authentication. To use Github, first log out and then
- click 'Login' at the top of any BMO page and then click on the 'Github' login image. You will need to have a Github account that
- has an email address the same as the Persona email you were using, otherwise a different BMO account will be created. You will
- be able to choose the email address you want to use for BMO if you have more than one configured in your Github profile. If none
- of the email addresses you have configured in Github match what you were using for Persona, native login described above may be
- your best choice if you want to retain your BMO data.
-</p>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl b/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl
index 8ee3d0d59..6c0387ec0 100644
--- a/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/release_tracking_report.html.tmpl
@@ -97,7 +97,7 @@ var default_query = '[% default_query FILTER js %]';
</span>
</td>
</tr>
-
+
<tr>
<td>&nbsp;</td>
<td colspan="2">
diff --git a/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl b/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl
index 9e6d72d66..6091810db 100644
--- a/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/upgrade-3.6.html.tmpl
@@ -74,7 +74,7 @@
<p>Work continues on improving usability for the next release of
[%+ terms.Bugzilla %], but the results of the research have already
had an impact on this 3.6 release.</p>
-
+
<h4>Improved Quicksearch</h4>
<p>The "quicksearch" box that appears on the front page of
@@ -113,7 +113,7 @@
<p>There is now a "Browse" link in the header of each [% terms.Bugzilla %]
page that presents a very basic interface that allows users to simply
browse through all open [% terms.bugs %] in particular components.</p>
-
+
<h4>JSON-RPC Interface</h4>
<p>[% terms.Bugzilla %] now has support for the
@@ -134,7 +134,7 @@
mandatory.</li>
<li><b>[% terms.Bug %] Filing:</b> "Bookmarkable templates" now
support the "alias" and "estimated hours" fields.</li>
-
+
<li><b>[% terms.Bug %] Editing:</b> In previous versions of
[%+ terms.Bugzilla %], if you added a private comment to [% terms.abug %],
then <em>none</em> of the changes that you made at that time were
@@ -165,10 +165,10 @@
<li><b>Attachments:</b> When you click on an "attachment 12345" link
in a comment, if the attachment is a patch, you will now see the
formatted "Diff" view instead of the raw patch.</li>
- <li><b>Attachments</b>: For text attachments, we now let the browser
+ <li><b>Attachments</b>: For text attachments, we now let the browser
auto-detect the character encoding, instead of forcing the browser to
always assume the attachment is in UTF-8.</li>
-
+
<li><b>Search:</b> You can now display [% terms.bug %] flags as a column
in search results.</li>
<li><b>Search:</b> When viewing search results, you can see which columns are
@@ -188,7 +188,7 @@
<kbd>buglist.cgi</kbd> now accepts nearly every valid field in
[%+ terms.Bugzilla %] as a direct URL parameter, like
<kbd>&amp;field=value</kbd>.</li>
-
+
<li><b>Requests:</b> When viewing the "My Requests" page, you can now
see the lists as a normal search result by clicking a link at the
bottom of each table.</li>
@@ -208,7 +208,7 @@
if there are no [% terms.bugs %] that match your searches.</li>
<li>The arrows in dependency graphs now point the other way, so that
[%+ terms.bugs %] point at their dependencies.</li>
-
+
<li><b>New Charts:</b> You can now convert an existing Saved Search
into a data series for New Charts.</li>
<li><b>New Charts:</b> There is now an interface that allows you to
@@ -241,7 +241,7 @@
<li>Information about duplicates is now stored in the database instead
of being stored in the <kbd>data/</kbd> directory. On large installations
this could save several hundred megabytes of disk space.</li>
-
+
<li>When editing a group, you can now specify that members of a group
are allowed to grant others membership in that group itself.</li>
<li>The ability to compress BMP attachments to PNGs is now an Extension.
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index 5603b943f..1d6e222c6 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -99,7 +99,7 @@
There used to be an issue in <a href="https://www.bugzilla.org/">Bugzilla</a>
which caused activity data to be lost if there were a large number of cc's
or dependencies. That has been fixed, but some data was already lost in
- your activity table that could not be regenerated. The changes that
+ your activity table that could not be regenerated. The changes that
could not reliably determine are prefixed by '?'.
</p>
[% END %]