4 files changed, 34 insertions, 3 deletions
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index a8e8a297b..1cf0c344f 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -78,4 +78,12 @@
     _ " use the <code>http://user:pass@proxy_url/</code> syntax.",
 
   strict_transport_security => sts_desc,
+
+  disable_bug_updates =>
+    "When enabled, all updates to $terms.bugs will be blocked.",
+
+  arecibo_server =>
+    "When set, important errors and warnings will be sent to the"
+    _ " specified Arecibo server. Enter the Arecibo server's full URL;"
+    _ " eg <code>https://arecibo.example.com/v/1/</code>.",
 } %]
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 2e11dffbc..7a8d34791 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -107,6 +107,12 @@
                   "front page will require a login. No anonymous users will " _
                   "be permitted.",
 
+  webservice_email_filter => "Filter email addresses returned by the WebService API depending on " _
+                             "if the user is logged in or not. This works similarly to how the " _
+                             "web UI currently filters email addresses. If <tt>requirelogin</tt> " _
+                             "is enabled,  then this parameter has no effect as users must be logged " _
+                             "in to use Bugzilla.",
+
   emailregexp => "This defines the regexp to use for legal email addresses. The " _
                  "default tries to match fully qualified email addresses. Another " _
                  "popular value to put here is <tt>^[^@]+$</tt>, which means " _
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 3efa4b8bf..010cacb73 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -116,9 +116,15 @@
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% INCLUDE listselectionhiddenfields %]
 
-  or <a href="editusers.cgi?action=activity&amp;userid=[% otheruser.id %]"
-        title="View Account History for '
-        [%- otheruser.login FILTER html %]'">View Account History</a>
+  [% IF editusers %], [% ELSE %] or [% END %]
+  <a href="editusers.cgi?action=activity&amp;userid=[% otheruser.id %]"
+     title="View Account History for '
+     [%- otheruser.login FILTER html %]'">View Account History</a>
+  [% IF editusers %]
+    or <a href="editusers.cgi?action=admin_activity&amp;userid=[% otheruser.id %]"
+          title="View Account History for '
+          [%- otheruser.login FILTER html %]'">View Admin History</a>
+  [% END %]
 </p>
 </form>
 <p>
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index 3f745a458..4d1d35c95 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -51,6 +51,17 @@
   ]
 %]
 
+[% IF editusers %]
+  [% columns.push({
+     heading     => 'Admin History'
+     content     => 'View'
+     contentlink => 'editusers.cgi?action=admin_activity' _
+                            '&amp;userid=%%userid%%' _
+                            listselectionurlparams
+   })  
+  %]
+[% END %]
+
 [% IF Param('allowuserdeletion') && editusers %]
   [% columns.push({heading     => 'Action'
                    content     => 'Delete'