Merge branch 'master' into develop

app/views/users/names/edit.html.erb

@@ -19,8 +19,8 @@
   </p>
 
   <p>
-    <%= _('If you are trying to <strong>remove your name</strong>, please
-          <a href="{{contact_us_url}}">contact us</a>.',
+    <%= _('If you are trying to <strong>remove your name</strong>, please ' \
+          '<a href="{{contact_us_url}}">contact us</a>.',
           contact_us_url: help_contact_path) %>
   </p>
 </div>

config/initializers/alaveteli.rb

@@ -10,7 +10,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.43.2.0'
+ALAVETELI_VERSION = '0.44.0.0'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

doc/CHANGES.md

@@ -1,15 +1,120 @@
-# develop
+# 0.44.0.0
 
 ## Highlighted Features
 
+* Improve handling of messages with multiple email addresses (Alexander Griffen)
+* Fix admin timeline filters (Helen Cross, Graeme Porteous)
+* Update Docker environment scripts (Graeme Porteous)
+* Allow authority disclosure log URLs to be translated (Graeme Porteous)
 * Remove Vagrant development boxes (Graeme Porteous)
+* Improve calculation of authority home pages (Gareth Rees)
+* Apply attachment censor rules and masks in the background (Graeme Porteous)
+* Remove "inline" background job processing (Graeme Porteous)
+* Add Xapian background job queue (Graeme Porteous)
+* Single request guess delivery (Alexander Griffen, Graeme Porteous)
+* Detect request email addresses in BCC/Received by headers (Alexander Griffen)
+* Add disclosure log to authority JSON (Graeme Porteous)
+* Add notify varnish cache job (Matthew Somerville, Graeme Porteous)
+* Improve user comment anonymisation (Graeme Porteous)
+* Show admin users previous names and slugs (Graeme Porteous)
+* Add ability for users to change their name (Graeme Porteous)
+* Separate admin account closure actions (Alexander Griffen, Gareth Rees)
+* Make user content limit configurable (Gareth Rees)
+* Add CSV files to Google Doc Viewer and refactoring (Gareth Rees)
+* Show authority notes in admin (Helen Cross)
+* Fix IP address matching in user spam scorer (Graeme Porteous)
+* Fix logging duplicate events (Matthew Somerville)
+* Fix favicon web server configuration (Graeme Porteous)
+* Fix asset compilation issues (Graeme Porteous)
+* Fix POP poller timeouts (Graeme Porteous)
+* Code linting updates and refactoring (Alexander Griffen)
+* Dependencies upgrades (Graeme Porteous)
+
+## Highlighted Pro Features
+
+* View and download subscription invoices (Graeme Porteous)
+* Add subscription started webhook state (Graeme Porteous)
+* Update Stripe token information (Graeme Porteous)
+* Improve batch request sending memory limit (Laurent Savaete)
+* Fix draft batch request composition bug (Graeme Porteous)
 
 ## Upgrade Notes
 
+* _Note:_ There has been some issues with the "inline" background job mode
+  introduced in 0.43.0.0. This meant not all jobs were being executed so we
+  which caused errors. We have decided to removed this option so please switch
+  to "server" mode which means setting up Redis and Sidekiq. See the upgrade
+  notes from v0.43.0.0 for instructions on how to do this.
+
+* _Required:_ Please update your `config/sidekiq.yml` file to include the
+  `xapian` queue and limit option. See `config/sidekiq.yml-example` as an
+  example.
+
+* _Required:_ There are some database structure updates so remember to run:
+
+      bin/rails db:migrate
+
+* _Required:_ To populate `OutgoingMessage#from_name`, please run:
+
+      bin/rails temp:populate_outgoing_message_from_name
+
+* _Required:_ Migrate current `User#url_name` to a new slug model, please run:
+
+      bin/rails temp:migrate_user_slugs
+
+* _Required:_ Migrate `PublicBody#disclosure_log` to transaction model, please
+  run:
+
+      bin/rails temp:migrate_disclosure_log
+
+* _Note:_ This release allow users to rename their user account but this is for
+  requests going forward. This is due to the possibility of authorities replying
+  to past requests with the user's previous name so we can't 100% disassociated
+  past requests or annotations from the user's previous name.
+
+* _Note:_ If you use Varnish hosts as a caching layer, Alaveteli can now
+  automatically clear cached pages when request/user/other content is changed.
+  This is done by making `BAN` and `PURGE` requests to your Varnish hosts. Set
+  `VARNISH_HOST` in `config/general.yml` if you want to enable this but this
+  may also require changes to how your Varnish hosts are configured. If you want
+  help setting this up please contact us.
+
 * _Note:_ If you were using Vagrant development boxes these are now unsupported.
   Please switch to using Docker. See:
   https://alaveteli.org/docs/installing/docker/
 
+### Changed Templates
+
+The following templates have been changed. Please update overrides in your theme
+to match the new templates.
+
+    app/views/admin/blog_posts/_about.html.erb
+    app/views/admin/notes/_show.html.erb
+    app/views/admin_announcements/_form.html.erb
+    app/views/admin_incoming_message/bulk_destroy.html.erb
+    app/views/admin_outgoing_message/edit.html.erb
+    app/views/admin_public_body/_one_list.html.erb
+    app/views/admin_raw_email/_holding_pen.html.erb
+    app/views/admin_request/_some_annotations.html.erb
+    app/views/admin_request/show.html.erb
+    app/views/admin_user/edit.html.erb
+    app/views/admin_user/show.html.erb
+    app/views/alaveteli_pro/batch_request_authority_searches/_public_bodies.html.erb
+    app/views/alaveteli_pro/subscriptions/index.html.erb
+    app/views/comment/rate_limited.html.erb
+    app/views/followups/_followup.html.erb
+    app/views/layouts/admin.html.erb
+    app/views/notification_mailer/daily_summary.text.erb
+    app/views/request/_after_actions.html.erb
+    app/views/request/_attachments.html.erb
+    app/views/request/_citations.html.erb
+    app/views/request/_outgoing_correspondence.html.erb
+    app/views/request/_outgoing_correspondence.text.erb
+    app/views/request/request_subtitle/allow_new_responses_from/_authority_only.html.erb
+    app/views/request/request_subtitle/allow_new_responses_from/_nobody.html.erb
+    app/views/user/show/_show_profile.html.erb
+    app/views/users/messages/rate_limited.html.erb
+
 # 0.43.2.0
 
 ## Highlighted Features

locale/af_ZA/app.po

@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 14:26+0100\n"
+"POT-Creation-Date: 2023-10-17 16:36+0100\n"
 "PO-Revision-Date: 2011-03-09 17:48+0000\n"
 "Last-Translator: FOI Monkey, 2022\n"
 "Language-Team: Afrikaans (South Africa) (http://app.transifex.com/mysociety/al"
@@ -290,6 +290,9 @@ msgstr ""
 msgid "<strong>Donate</strong> to {{site_name}}"
 msgstr ""
 
+msgid "<strong>If you change your name, the name on your old requests won't change.</strong> When you send a request, we use the name you gave us. This makes it hard to stop your old and new names from being connected. This means your old name will still show up on requests that you've already sent and on your public profile page."
+msgstr ""
+
 msgid "<strong>Journalist, Academic or Power User?</strong> {{pro_site_link}} is an all-in-one FOI toolkit including everything you need to keep on top of complex FOI-driven investigations."
 msgstr ""
 
@@ -557,9 +560,15 @@ msgstr ""
 msgid "Attachment (optional):"
 msgstr ""
 
+msgid "Attachment available for download."
+msgstr ""
+
 msgid "Attachment has been removed"
 msgstr ""
 
+msgid "Attachment processing..."
+msgstr ""
+
 msgid "Attachment:"
 msgstr ""
 
@@ -695,6 +704,12 @@ msgstr ""
 msgid "Change your email address used on {{site_name}}"
 msgstr ""
 
+msgid "Change your name"
+msgstr ""
+
+msgid "Change your name used on {{site_name}}"
+msgstr ""
+
 msgid "Change your password"
 msgstr ""
 
@@ -950,6 +965,9 @@ msgstr ""
 msgid "Download a zip file of all correspondence"
 msgstr ""
 
+msgid "Download attachment"
+msgstr ""
+
 msgid "Download original attachment"
 msgstr ""
 
@@ -1285,7 +1303,7 @@ msgstr ""
 msgid "Here you can see how often {{site_name}} administrators have hidden requests."
 msgstr ""
 
-msgid "Here's your daily request summary from {{site_name}}"
+msgid "Here's your daily request summary from {{site_name}}:"
 msgstr ""
 
 msgid "Hi! We need your help. The person who made the following request hasn't told us whether or not it was successful. Would you mind taking a moment to read it and help us keep the place tidy for everyone? Thanks."
@@ -1369,6 +1387,9 @@ msgstr ""
 msgid "If this is incorrect, or you would like to send a late response to the request or an email on another subject to {{user}}, then please email {{contact_email}} to ask us to reopen the request. You can then resend the response."
 msgstr ""
 
+msgid "If you <strong>don't want your new name to be linked to your old one</strong>, it's a good idea to make a new account instead."
+msgstr ""
+
 msgid "If you are dissatisfied by the response you got from the public authority, you have the right to complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
@@ -1384,6 +1405,9 @@ msgstr ""
 msgid "If you are the requester, then you may {{sign_in_link}} to view the request."
 msgstr ""
 
+msgid "If you are trying to <strong>remove your name</strong>, please <a href=\"{{contact_us_url}}\">contact us</a>."
+msgstr ""
+
 msgid "If you are {{user_link}}, please"
 msgstr ""
 
@@ -1666,6 +1690,12 @@ msgstr ""
 msgid "Name is already taken"
 msgstr ""
 
+msgid "Name successfully updated."
+msgstr ""
+
+msgid "Name:"
+msgstr ""
+
 msgid "Needs admin attention"
 msgstr ""
 
@@ -1762,6 +1792,9 @@ msgstr ""
 msgid "Not held"
 msgstr ""
 
+msgid "Note that it may take some time to link your previous requests to your new account name."
+msgstr ""
+
 msgid "Note that the requester will not be notified about your annotation, because the request was published by {{public_body_name}} on their behalf."
 msgstr ""
 
@@ -2115,6 +2148,9 @@ msgstr ""
 msgid "Previous message"
 msgstr "Vorige boodskap"
 
+msgid "Previously known as:"
+msgstr ""
+
 msgid "Print your one time passcode"
 msgstr ""
 
@@ -2684,6 +2720,9 @@ msgstr ""
 msgid "Subscription renewed after failure"
 msgstr ""
 
+msgid "Subscription started"
+msgstr ""
+
 msgid "Success"
 msgstr ""
 
@@ -2795,6 +2834,9 @@ msgstr ""
 msgid "The article references all requests in this batch"
 msgstr ""
 
+msgid "The attachment has now been processed and is available for download."
+msgstr ""
+
 msgid "The authority do <strong>not have</strong> the information <small>(maybe they say who does)</small>"
 msgstr ""
 
@@ -3588,6 +3630,9 @@ msgstr ""
 msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}."
 msgstr ""
 
+msgid "We don't have this attachment in our cache at present, we are now processing your request and this page will reload once the attachment is available."
+msgstr ""
+
 msgid "We don't know the delivery status for this message."
 msgstr ""
 
@@ -3904,6 +3949,9 @@ msgstr ""
 msgid "You need to be logged in to change the text about you on your profile."
 msgstr ""
 
+msgid "You need to be logged in to change your name"
+msgstr ""
+
 msgid "You need to be logged in to change your profile photo."
 msgstr ""
 
@@ -4047,6 +4095,9 @@ msgstr ""
 msgid "Your name and annotation will appear in <strong>search engines</strong>."
 msgstr ""
 
+msgid "Your name has been changed since your last message in this request. Please consider mentioning this to the authority and explain that you are the original requester."
+msgstr ""
+
 msgid "Your name, request and any responses will appear in <strong>search engines</strong> (<a href=\"{{url}}\">details</a>)."
 msgstr ""