aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-2/+0
|\
| * Remove special-notice styling.Louise Crow2014-01-14-2/+0
| | | | | | | | We've removed it from whatdotheyknow-theme
* | Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-1/+1
|\|
| * Don't pad banner and entirebodyLouise Crow2014-01-14-1/+1
| | | | | | | | banner is inside entirebody.
* | Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-79/+90
|\|
| * Cleanup popup notices.Louise Crow2014-01-14-46/+57
| | | | | | | | | | | | | | | | Move HTML to view from controller, use same elements for other country popup and everypage - partly so they don't display on top of each other anymore. Don't position them over existing content, position them at the top of the page. Use consistent styling, and keep the javascript unobtrusive.
| * Whitespace changes.Louise Crow2014-01-14-33/+33
| |
| * Neaten up spacing of admin bar in main site context.Louise Crow2014-01-13-2/+2
|/
* Remove the duplicate close button on the popup bannerMark Longair2013-12-10-1/+0
|
* Add an 'Allow' directive to allow crawling of cached attachments.Louise Crow2013-12-05-1/+5
| | | | Should resolve #1233
* Treat any document/pdf attachment as if it were application/pdfMark Longair2013-12-05-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 'hotfix/0.15.0.2' into wdtkLouise Crow2013-12-04-2/+25
|\ | | | | | | | | Conflicts: Gemfile
| * Apply monkey patch for CVE-2013-6414.0.15.0.2hotfix/0.15.0.2Louise Crow2013-12-04-0/+22
| |
| * Set enforce_available_locales to falseLouise Crow2013-12-03-0/+2
| | | | | | | | | | This was the previous behaviour. Setting it explicitly avoids a deprecation warning.
| * Upgrade i18n to get fix for CVE-2013-4492.Louise Crow2013-12-03-1/+1
| |
| * Session keys are stored as strings in Rails 3.0.15.0.1hotfix/0.15.0.1Louise Crow2013-11-19-30/+30
| | | | | | | | Update our session-stripping code.
| * Insert cookie stripping at correct point in middleware stack.Louise Crow2013-11-19-1/+13
| |
| * Update commonlib to include Alaveteli support in install-site.shMark Longair2013-11-19-0/+0
| |
| * Use upstream globalize.Mark Longair2013-11-19-36/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're trying to switch to an upstream version of globalize, which now has Henare's change to allowed blank values without them being converted to nil - however, there is another intermediate change that was introduced which means that the name is only written back to the original table if the locale matches the default locale. This is described in more depth here: globalize/globalize#183 This change broke the make_single_language_example helper, but this commit fixes that by also setting the default locale before creating the example public bodies.
| * Merge branch 'master', remote-tracking branch 'origin'Louise Crow2013-11-18-0/+0
| |
* | Merge branch 'feature/restore-caching' into wdtkLouise Crow2013-11-26-3/+3
|\ \
| * | Ruby 1.8 compatibility fixes.Louise Crow2013-11-26-3/+3
| | |
* | | Merge branch 'feature/restore-caching' into wdtkLouise Crow2013-11-26-425/+266
|\| |
| * | Make fragment caching dependent on a config variable.Louise Crow2013-11-25-2/+15
| | |
| * | Set cache store to memcached, turn off rack-cache.Louise Crow2013-11-25-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The rack-cache gem version used by Rails (and turned on by default in 3.1) has a bug using memcached backend and the backend is unavailable. Note that we could just add the git version with the relevant pull request merged to the Gemfile if we wanted to keep rake-cache on, but it seems like Varnish should really be doing the job of whole page caching better for us.
| * | Add a rake task to analyse the distribution of hits to requests.Louise Crow2013-11-25-284/+32
| | | | | | | | | | | | Also removes old temp tasks.
| * | Restore caching for five minutes to frontpage.Louise Crow2013-11-25-1/+2
| | |
| * | Move getting recent requests into a helper method.Louise Crow2013-11-25-66/+86
| | |
| * | Use built-in SQL quoting.Louise Crow2013-11-25-2/+3
| | |
| * | Move getting popular bodies into a model method.Louise Crow2013-11-25-23/+26
| | |
| * | Cache the similar requests for 1 dayLouise Crow2013-11-25-1/+9
| | |
| * | Move getting similar requests to the InfoRequest model.Louise Crow2013-11-25-14/+38
| | |
| * | Merge branch 'rails-3-develop' of ↵Louise Crow2013-11-19-42/+86
| |\ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| | * | Also update Gemfile.lock to refer to the upstream globalizeMark Longair2013-11-19-3/+3
| | | |
| | * | Merge branch 'all-authorities-reduce-memory' into rails-3-developMark Longair2013-11-19-7/+43
| | |\ \ | | | | | | | | | | | | | | | | | | | | This has already been cherry-picked into the wdtk branch, but it should also be merged into rails-3-develop
| | | * | Reduce the memory used to serve /body/all-authorities.csvMark Longair2013-11-14-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On WDTK, /body/all-authorities was using lots of memory - this commit reduces that by (a) fetching the public bodies in batches, rather than keeping them all in memory at one time and (b) writing the CSV to a file and then returning it with X-Sendfile (or equivalent), rather than returning the whole file from memory with send_data. There's a FIXME to do with the layout of download directories; if that's changed, the example nginx config, etc. will need to be updated too. This commit also adds a basic test for reasonable CSV being returned and switches from FasterCSV to CSV in order to fix this NotImplementedError under Ruby 1.9: Please switch to Ruby 1.9's standard CSV library. It's FasterCSV plus support for Ruby 1.9's m17n encoding engine. (The CSV version seems to still work fine under 1.8.7.)
| | * | | Merge branch 'fixes-for-upstream-globalize' into rails-3-developMark Longair2013-11-19-32/+40
| | |\ \ \
| | | * | | Fix construction of example public bodies for upstream globalizeMark Longair2013-11-19-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're trying to switch to an upstream version of globalize, which now has Henare's change to allowed blank values without them being converted to nil - however, there is another intermediate change that was introduced which means that the name is only written back to the original table if the locale matches the default locale. This is described in more depth here: https://github.com/globalize/globalize/pull/183 This change broke the make_single_language_example helper, but this commit fixes that by also setting the default locale before creating the example public bodies.
| | | * | | Refactor some tests to use with_default_localeMark Longair2013-11-19-17/+15
| | | | | |
| | | * | | Add a helper method for temporarily setting I18n.default_localeMark Longair2013-11-19-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the I18n library has an I18n.with_locale helper, there's no equivalent for I18n.default_locale. This method will make a couple of our tests clearer and less brittle.
| | * | | | Update commonlib to include Alaveteli support in install-site.shMark Longair2013-11-19-0/+0
| | | | | |
| * | | | | Merge branch 'feature/set-rails-env-from-cap-config' into rails-3-developLouise Crow2013-11-19-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add rails env to example config.Louise Crow2013-11-19-0/+2
| | | | | |
| | * | | | Allow the rails_env to be set from the deploy.yml file.Louise Crow2013-11-19-0/+1
| |/ / / /
| * / / / Use our own copy of globalize3 for now.Louise Crow2013-11-19-4/+4
| |/ / /
| * | | Update globalize3 repo.Louise Crow2013-11-18-5/+5
| | | | | | | | | | | | | | | | This is the commit where @henares' pull request was merged. This is a quick fix, but I think we want to see if we can use the globalize 3.0.1 gem with minimal fixes. It causes tests to fail at the moment, I think because we still have translated attributes in our public_bodies table (and not null constraints at the databse level on at least the name attribute).
| * | | Insert cookie stripping at correct point in middleware stack.Louise Crow2013-11-18-1/+13
| | | |
| * | | Session keys are stored as strings in Rails 3.Louise Crow2013-11-18-30/+30
| | | | | | | | | | | | | | | | Update our session-stripping code.
| * | | Merge branch 'master' into rails-3-developMark Longair2013-11-15-289/+317
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'rails-3-develop' of ↵Louise Crow2013-11-12-2713/+6930
| |\ \ \ | | | |/ | | |/| | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 13:03:36 +0000