diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/views/admin_request/_some_annotations.html.erb | 48 | ||||
| -rw-r--r-- | app/views/admin_request/show.html.erb | 49 | ||||
| -rw-r--r-- | app/views/admin_user/show.html.erb | 6 | ||||
| -rw-r--r-- | doc/CHANGES.md | 52 | ||||
| -rwxr-xr-x | script/site-specific-install.sh | 5 |
6 files changed, 114 insertions, 48 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 62258c0c6..492c855c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,7 +266,7 @@ GEM nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) - will_paginate (3.0.4) + will_paginate (3.0.5) xapian-full-alaveteli (1.2.9.5) xml-simple (1.1.2) zip (2.0.2) diff --git a/app/views/admin_request/_some_annotations.html.erb b/app/views/admin_request/_some_annotations.html.erb new file mode 100644 index 000000000..dfd46f828 --- /dev/null +++ b/app/views/admin_request/_some_annotations.html.erb @@ -0,0 +1,48 @@ +<% if comments.size > 0 %> + <div class="accordion" id="comments"> + <% for comment in comments %> + <div class="accordion-group"> + <div class="accordion-heading"> + <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> + <%= link_to admin_request_edit_comment_path(comment) do %> + #<%=comment.id%> + -- + <%=h(comment.user.name)%> + <%=admin_value(comment.created_at)%> + <% end %> + <blockquote class="incoming-message"> + <%= truncate(comment.body, :length => 400) %> + </blockquote> + </div> + <div id="comment_<%=comment.id%>" class="accordion-body collapse"> + <table class="table table-striped table-condensed"> + <tbody> + <tr> + <td colspan="2"> + By <%= user_both_links(comment.user) %> + </td> + </tr> + <% comment.for_admin_column do |name, value, type, column_name |%> + <tr> + <td> + <b><%=name%></b> + </td> + <td> + <% if column_name == 'body' && !comment.visible %> + <s><%=h comment.send(column_name) %></s> + <% else %> + <%=h comment.send(column_name) %> + <% end %> + </td> + </tr> + <% end %> + </tbody> + </table> + </div> + </div> + <% end %> + </div> +<% else %> + <p>None yet.</p> +<% end %> + diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index 83d9c3764..2589e52b4 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -325,53 +325,8 @@ <hr> <h2>Annotations</h2> -<% if @info_request.comments.size > 0 %> - <div class="accordion" id="comments"> - <% for comment in @info_request.comments %> - <div class="accordion-group"> - <div class="accordion-heading"> - <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> - <%= link_to admin_request_edit_comment_path(comment) do %> - #<%=comment.id%> - -- - <%=h(comment.user.name)%> - <%=admin_value(comment.created_at)%> - <% end %> - <blockquote class="incoming-message"> - <%= truncate(comment.body, :length => 400) %> - </blockquote> - </div> - <div id="comment_<%=comment.id%>" class="accordion-body collapse"> - <table class="table table-striped table-condensed"> - <tbody> - <tr> - <td colspan="2"> - By <%= user_both_links(comment.user) %> - </td> - </tr> - <% comment.for_admin_column do |name, value, type, column_name |%> - <tr> - <td> - <b><%=name%></b> - </td> - <td> - <% if column_name == 'body' && !comment.visible %> - <s><%=h comment.send(column_name) %></s> - <% else %> - <%=h comment.send(column_name) %> - <% end %> - </td> - </tr> - <% end %> - </tbody> - </table> - </div> - </div> - <% end %> - </div> -<% else %> - <p>None yet.</p> -<% end %> +<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @info_request.comments } %> + <hr> <h2>Mail server delivery logs</h2> diff --git a/app/views/admin_user/show.html.erb b/app/views/admin_user/show.html.erb index c93c08e50..6d12aeff5 100644 --- a/app/views/admin_user/show.html.erb +++ b/app/views/admin_user/show.html.erb @@ -91,6 +91,12 @@ <hr> +<h2>Annotations</h2> + +<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @admin_user.comments } %> + +<hr> + <h2>Censor rules</h2> <%= render :partial => 'admin_censor_rule/show', :locals => { :censor_rules => @admin_user.censor_rules, :user => @admin_user } %> diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 45b8c3cc9..07d8cf613 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,55 @@ +# Version 0.16 + +## Highlighted features + +* Upgrade of the Rails framework to 3.2.16 +* Enabling the Rails asset pipeline for managing assets (more about the + asset pipeline at http://guides.rubyonrails.org/asset_pipeline.html). +* The all authorities csv download now uses less system resources +* Ruby 2.0 is now included in the matrix of versions we run continuous + integration tests against +* When using capistrano, the RAILS_ENV can now be explicitly set from + deploy.yml +* The front page and request pages once more use fragment caching backed + by memcached to speed up serving of slow parts of these pages +* The robots.txt file has been updated to allow crawling of response + attachment files (in original and HTML versions) +* The `themes:install` rake task is kinder to developers; it no longer + removes and reclones themes, destroying local changes, and it keeps + themes as git repositories. +* Social media elements (the blog, twitter feed) are only included if + the appropriate config variables (BLOG_FEED and TWITTER_USERNAME) have + been populated. +* Some fixes to the treatment of hyphenated/underscored locales so that + public body translations are consistently stored using the underscore + format of the locale (so 'he_IL', not 'he-IL'). + +## Upgrade notes + +* You will need to update your theme to use the asset pipeline - notes + on how to do this are in doc/THEME-ASSETS-UPGRADE.md +* The syntax of the highlight and excerpt methods has changed, so if you + use these in your theme, you may see deprecation warnings until you + update them. More information at http://apidock.com/rails/v3.2.13/ActionView/Helpers/TextHelper/highlight + and + http://apidock.com/rails/v3.2.13/ActionView/Helpers/TextHelper/excerpt +* If you don't want to use fragment caching, you can turn it off in your + config file by setting `CACHE_FRAGMENTS` to `false`. +* If you use a locale with an underscore in it, you should double check + that the locale field of your `public_body_translations` table shows + the underscore version of the locale name. +* This release includes an update to the commonlib submodule - you + should be warned about this when running rails-post-deploy +* All code has been moved out of the deprecated plugin path + `vendor/plugins`. Once you are up and running under 0.16, you should + check that your xapian databases have all been copied to + `lib/acts_as_xapian/xapiandbs` (the code in + `config/initializers/acts_as_xapian` should do this), and then check + and remove any files under vendor/plugins so that you won't get + deprecation warnings about having Rails 2.3 style plugins (deprecation + warnings can result in incoming mail getting an auto reply under some + email configs). + # Version 0.15 ## Highlighted features diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index 8917fd577..7d47a5990 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -66,6 +66,11 @@ ensure_line_present \ /etc/postfix/main.cf 644 ensure_line_present \ + "^ *myhostname *=" \ + "myhostname = $(hostname --fqdn)" \ + /etc/postfix/main.cf 644 + +ensure_line_present \ "^do-not-reply" \ "do-not-reply-to-this-address: :blackhole:" \ /etc/aliases 644 |