aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'rails-3-develop' of ↵Louise Crow2013-12-19-47/+61
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Merge branch 'feature/install-script-rewrite-hostname' into rails-3-developMark Longair2013-12-17-0/+5
| |\
| | * Rewrite myhostname in /etc/postfix/main.cf in the install scriptMark Longair2013-12-10-0/+5
| | | | | | | | | | | | | | | | | | | | | This is necessary because the install script is also run on creating a new EC2 instance from the AMI in order to update the configuration with the new internal and external names; the hostname will be different in this case and otherwise myhostname wouldn't be rewritten.
| * | Merge branch 'ab_annotations_1' into rails-3-developMark Longair2013-12-17-47/+56
| |\ \
| | * | Display annotations on user page.Andrew Black2013-12-16-3/+10
| | | | | | | | | | | | | | | | | | | | Parameterise /admin_request/_some_annotations.html.erbi to allow it to be called from user and request pages
| | * | Move annotations to _some_annotations.html.erbAndrew Black2013-12-16-47/+49
| | | | | | | | | | | | | | | | And refactor admin_request/show.html.erb to use this.
* | | | Update will_paginate gem.Louise Crow2013-12-19-1/+1
|/ / /
* | | Merge branch 'feature/localise-reports' into rails-3-developLouise Crow2013-12-16-4/+4
|\ \ \
| * | | Mark up some more text for translation.Louise Crow2013-12-16-4/+4
| | | |
* | | | Merge branch 'feature/interpolation-fixes' into rails-3-developLouise Crow2013-12-12-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add extra argument for MissingInterpolationArgument errorLouise Crow2013-12-12-2/+2
|/ / / | | | | | | | | | Revert translation of interpolated variable in French locale.
* | | Remove old patch.Louise Crow2013-12-11-16/+0
| | |
* | | Small fixes for favicon.icoLouise Crow2013-12-10-1/+2
| | |
* | | Syntax fixes.Louise Crow2013-12-09-5/+5
| | |
* | | Latest translations from TransifexLouise Crow2013-12-09-419/+10965
| | |
* | | Merge branch 'feature/world-sites-update' into rails-3-developLouise Crow2013-12-09-1/+14
|\ \ \
| * | | Add the newest Alaveteli sites.Louise Crow2013-12-09-1/+14
| | |/ | |/|
* | | Merge branch 'feature/add-favicon-link' into rails-3-developLouise Crow2013-12-09-1/+1
|\ \ \ | |/ / |/| |
| * | Use a favicon link helper to point to our pipeline favicon.Louise Crow2013-12-09-1/+1
| | |
* | | Merge branch 'feature/en-ug-translation' into rails-3-developLouise Crow2013-12-09-0/+3510
|\ \ \
| * | | Add Ugandan English translation file.Louise Crow2013-12-09-0/+3510
| | | | | | | | | | | | | | | | N.B. as we haven't been able to get Transifex to add en_UG yet, this file was updated in poedit locally.
* | | | Merge branch 'feature/display-social-media-when-configured' into rails-3-developLouise Crow2013-12-09-0/+19
|\ \ \ \
| * | | | Only show the blog if a BLOG_FEED is configured.Louise Crow2013-12-09-0/+17
| | | | |
| * | | | Only show the twitter link if an account is configured.Louise Crow2013-12-09-0/+2
| |/ / /
* | | | Merge branch 'feature/1233-allow-crawling-of-attachments' into rails-3-developLouise Crow2013-12-09-1/+5
|\ \ \ \
| * | | | Add an 'Allow' directive to allow crawling of cached attachments.Louise Crow2013-12-03-1/+5
| | | | | | | | | | | | | | | | | | | | Should resolve #1233
* | | | | Merge branch 'feature/1263-public-body-translation-fix' into rails-3-developLouise Crow2013-12-09-6/+6
|\ \ \ \ \
| * | | | | Move disclosure log to common part of form.Louise Crow2013-12-04-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't in the list of attributes that is translated, so was causing a mass assignment error when the code in public_body.translated_versions= was attempting to assign it. There's a possible underlying inconsistency here between the treatment of publication_scheme and disclosure_log - one is translated and one isn't. I've ticketed that separately (#1264)
* | | | | | Merge branch 'feature/overridable-act-on' into rails-3-developLouise Crow2013-12-09-16/+16
|\ \ \ \ \ \
| * | | | | | Move "Act on what you've" learnt to partialLouise Crow2013-12-05-16/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | In order to make it easier to override.
* | | | | | Merge branch 'feature/locale-underscore-fixes' into rails-3-developLouise Crow2013-12-09-3/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make sure globalize uses the right locale version when updating.Louise Crow2013-12-05-2/+11
| | | | | |
| * | | | | Search for bodies using the underscore version of the locale.Louise Crow2013-12-05-1/+11
| |/ / / /
* | | | | More detail on how to make a pull request.Louise Crow2013-12-09-1/+2
| | | | |
* | | | | Merge branch 'feature/less-destructive-themes-install' into rails-3-developLouise Crow2013-12-09-59/+79
|\ \ \ \ \
| * | | | | Merge branch 'feature/less-destructive-themes-install' of ↵Louise Crow2013-12-09-59/+79
|/| | | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into feature/less-destructive-themes-install
| * | | | | Make 'rake themes:install' safer for developersMark Longair2013-12-06-59/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the themes:install rake task would remove the existing theme with 'rm -rf' and re-clone the theme into place. This is unfortunate for a developer who has been making changes to a theme and then runs the rails-post-deploy script, since it calls the themes:install task which will wipe out those changes. In addition, when installing themes it would deliberately remove the .git directory of the theme, so if you do want to work in that theme you'd have to reinitialize the theme directory to be a git repository again. This commit changes the task so that now: - If a theme directory is present but it isn't a git repository, it's moved out of the way. - If there's no theme directory at the expected location after that step, the theme repository is cloned into place - The task ensures that the origin remote points to the theme's URL, and fetches from that remote. - If there are any uncommitted changes in the theme repository or the current commit appears not to have been pushed, the task exits with a helpful error. - The preferred branch or tag is checked out in the theme repository as before. (The uninstall, install and post_install hooks are run as before.) This shouldn't make a difference to deployed instances of Alaveteli but will be helpful for developers who want to work on developing a theme. Fixes #1111.
* | | | | | Merge branch 'document-pdf-fix' into rails-3-developMark Longair2013-12-09-1/+117
|\ \ \ \ \ \
| * | | | | | Treat any document/pdf attachment as if it were application/pdfMark Longair2013-12-03-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for issue #1232. Richard Taylor pointed out that some PDF attachments had the non-standard content-type document/pdf, and that these weren't being treated as PDFs. (Ganesh Sittampalam discovered that all of these PDFs were generated by a Lexmark X945e, according to the PDF metadata.) This commit adds an extra case to normalise_content_type to map document/pdf to application/pdf. In fact, since the upgrade of the Mail gem in ccebe3c3d6d4dc5f81 the behaviour when handling the non-standard content-type document/pdf was much better, but this commit also means that you get the right icon for the attachment, and can be cherry-picked onto older versions to fix #1232.
* | | | | | | Merge branch 'fix-command-line-csv' into rails-3-developMark Longair2013-12-09-10/+41
|\ \ \ \ \ \ \
| * | | | | | | Fix the command-line CSV importer under Ruby 1.9Mark Longair2013-12-03-10/+41
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under Ruby 1.8.7, you can parse a CSV file with the following code (Example A): require 'csv' CSV.parse('foo.csv') do |row| puts "got row: #{row.inspect}" end Rather confusingly, under Ruby 1.8.7, CSV.parse can also take a string representation of the contents of the file as its parameter, so this also works (Example B): require 'csv' CSV.parse("1,hello,red\n2,goodbye,green") do |row| puts "got row: #{row.inspect}" end However under Ruby 1.9.3, CSV.parse only expects a string representation of the contents of the CSV file, so only Example B works; Example B fails silently (interpreting the filename as a single cell CSV file, typically). The import:import_csv rake task unfortunately relied on both A and B working. This commit fixes this by adding PublicBody.import_csv_from_file, and refactoring PublicBody.import_csv to use the newly added class method, and adds a test to check for any regression in this behaviour. (This means that the usage of import_csv in the admin public body controller's import_csv action could now be changed to use PublicBody.import_csv_from_file directly from the uploaded file, which would be more efficient and cope with larger files without using lots of memory.) Fixes #1229
* | | | | | | Merge branch 'feature/asset-fixes' into rails-3-developMark Longair2013-12-09-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove link to the now-removed theme.cssMark Longair2013-12-05-1/+0
| | | | | | | |
| * | | | | | | Fix the link to the fancybox CSSMark Longair2013-12-05-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'feature/fix-fake-response' into rails-3-developMark Longair2013-12-09-1/+23
|\ \ \ \ \ \ \
| * | | | | | | Use a better subject line than "Fake Response" for uploaded responsesMark Longair2013-12-06-1/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject line wasn't being explicitly specified in RequestMailer.fake_response and a default of "Fake Response" (somehow based on the method name) was being used instead; this subject line would sometimes be visible to users and authorities and caused alarm to them. Instead, we use the standard subject lines for followup emails for the InfoRequest. Fixes #1105.
* | | | | | | Revert "Add byebug, for interactive debugging under Ruby 2"Mark Longair2013-12-09-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3b86cb6129140fc123dc3aeffcccdb5652f19085. Conflicts: Gemfile The problem with this is the combination of these things: * bundler's behaviour on seeing a platform that it doesn't understand is to error, rather than to ignore it: https://github.com/bundler/bundler/issues/2428 * mySociety's servers currently only have version 1.1.4 of bundler * The :ruby_20 platform was only introduced in version 1.3.0 of bundler: https://github.com/bundler/bundler/blob/master/CHANGELOG.md#130pre3-dec-21-2012 So, for the moment we're just going to revert this change; upgrading bundler on our servers is a non-trivial job and being able to deploy on our servers is urgent and important.
* | | | | | | Merge remote-tracking branch 'openaustralia_github/consistent-admin-links' ↵Louise Crow2013-12-09-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into rails-3-develop
| * | | | | | | Make admin link order consistentHenare Degan2013-12-07-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the admin links and permalinks on annotations and incoming correspondence were reversed, this commit makes the admin link consistently appear on the left and the permalink thingo appear on the right.
* / / / / / / Correct small typo in README.mdGuy Freeman2013-12-09-1/+1
|/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 14:46:15 +0000