+ Alaveteli automatically imports posts from the configured + + BLOG_FEED to display around the site. +
+ ++ By default blog posts are listed by recency. When they're presented + alongside <%= link_to 'taggable content', admin_tags_path %>, Alaveteli + attempts to render relevant posts through matching tags. For example, + blog posts tagged with "climate" would be matched with records + (requests, authorities, etc) also tagged "climate". +
+None yet.
+None yet.
+ <% end %> +<%= tagging.to_json %><% end %> diff --git a/app/views/admin/users/_sign_in_table.html.erb b/app/views/admin/users/_sign_in_table.html.erb index 7bc3185d39..c7fa11a9d6 100644 --- a/app/views/admin/users/_sign_in_table.html.erb +++ b/app/views/admin/users/_sign_in_table.html.erb @@ -10,38 +10,63 @@ <% end %> <% if sign_ins.any? %> -
<%= user_both_links(sign_in.user) %> | +- - <%= link_to sign_in.ip, admin_sign_ins_path(query: sign_in.ip) %> - - | + +- - <% if sign_in.country %> - <%= link_to admin_sign_ins_path(query: sign_in.country) do %> - <%= sign_in.country %> - <% end %> - <% else %> - ?? - <% end %> - - | +
<%= user_both_links(sign_in.user) %> | + ++ + <%= link_to sign_in.ip, admin_sign_ins_path(query: sign_in.ip) %> + + | + ++ + <% if sign_in.country %> + <%= link_to admin_sign_ins_path(query: sign_in.country) do %> + <%= sign_in.country %> + <% end %> + <% else %> + ?? + <% end %> + + | -<%= admin_date(sign_in.created_at, ago_only: true) %> | +<%= admin_date(sign_in.created_at, ago_only: true) %> | -- <%= sign_in.other_users.size %> others using this - IP - | -
None yet.
<% end %> diff --git a/app/views/admin_censor_rule/_form.html.erb b/app/views/admin_censor_rule/_form.html.erb index 603dfe4a8f..25314ecca0 100644 --- a/app/views/admin_censor_rule/_form.html.erb +++ b/app/views/admin_censor_rule/_form.html.erb @@ -56,7 +56,10 @@+ Each rule applies sequentially to the text after having been modified by + the previous rule, so the order may matter depending on what you are + trying to redact. +
+diff --git a/app/views/admin_general/_admin_navbar.html.erb b/app/views/admin_general/_admin_navbar.html.erb index e93d8daa37..8838e892bd 100644 --- a/app/views/admin_general/_admin_navbar.html.erb +++ b/app/views/admin_general/_admin_navbar.html.erb @@ -53,6 +53,7 @@ Tools |