aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Translate titleRowan Crawford2014-02-10-1/+1
|
* Translate "make a new FOI request" in view emailRowan Crawford2014-02-10-2/+8
|
* Set blog and twitter params to empty string0.16.0.6hotfix/0.16.0.6Louise Crow2014-01-28-2/+2
| | | | | This is the default value from lib/configuration.rb if they aren't set and null values cause errors when .empty? is called on them.
* Handle a request with no user in the show request function0.16.0.5hotfix/0.16.0.5Louise Crow2014-01-28-1/+16
|
* Fixes for asset pipeline.0.16.0.4hotfix/0.16.0.4Louise Crow2014-01-27-7/+6
| | | | | | Remove rake namespace - clashes with rake variable used in precompiling assets. Make sure the symlinking and theme installation are done before precompiling assets.
* Restore other-country-notice0.16.0.3hotfix/0.16.0.3Louise Crow2014-01-27-0/+5
| | | | It got lost in a previous merge.
* Merge branch 'hotfix/0.16.0.2'0.16.0.2Louise Crow2014-01-24-2/+11
|\
| * Turn on precompilation of assets in Capistrano.hotfix/0.16.0.2Louise Crow2014-01-24-2/+2
| |
| * Add notes on resolving issues with cached attachment asset refs.Louise Crow2014-01-24-0/+8
| |
| * Add public/assets to SHARED_DIRECTORIES example.Louise Crow2014-01-24-0/+1
|/
* Merge branch 'hotfix/0.16.0.1'0.16.0.1Louise Crow2014-01-24-6/+6
|\
| * Fix typohotfix/0.16.0.1Louise Crow2014-01-24-1/+1
| |
| * Fixing more typosLouise Crow2014-01-24-2/+2
| |
| * Use direct asset references in attachment HTML view.Louise Crow2014-01-24-3/+3
|/ | | | This will be cached, so we don't want to use versioned asset references.
* Downgrade rubygems to 2.1.11Louise Crow2014-01-24-0/+1
| | | | | | Rubygems 2.2.0 appears to have dropped support for ruby 1.8.7 - the immediate problem for us is that there are errors in building the charlock_holmes gem.
* Merge branch 'release/0.16'0.16Louise Crow2014-01-24-3820/+20238
|\
| * Bump version number to 0.16release/0.16Louise Crow2014-01-24-1/+1
| |
| * Merge branch 'release/0.16' of ↵Louise Crow2014-01-24-90/+269
| |\ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into release/0.16
| | * Add a script to switch mySociety deployments to using shared filesMark Longair2014-01-23-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required by our switch to timestamped-based deploys. There are certain files and directories (e.g. cache, the Xapian databases, generated graphs) that should be shared between deployments, rather than recreating them when creating the next deployment in a new directory. This script should be run as a one-off before switching an instance to using timestamped deploys, to ensure that the existing data is stored in the shared subdirectory of the vhost directory, so that any future deployment can simply create symlinks into the shared directory.
| | * Add the SHARED_FILES_PATH, SHARED_FILES & SHARED_DIRECTORIES optionsMark Longair2014-01-22-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is to support sharing various files between multiple deployments of Alaveteli. If you have set SHARED_FILES_PATH, SHARED_FILES and SHARED_DIRECTORIES then the rails-deploy-before-down script will ensure that a symlink is created from each of the files or directories mentioned in SHARED_FILES and SHARED_DIRECTORIES to a corresponding path within SHARED_FILES_PATH.
| | * Split rails-post-deploy into rails-deploy-(before|while)-downMark Longair2014-01-22-90/+123
| | |
| * | Fix some typosLouise Crow2014-01-24-8/+8
| | |
| * | Latest translations from TransifexLouise Crow2014-01-24-649/+4159
| |/
| * Add some notes on the popup restyling changes.Louise Crow2014-01-14-0/+5
| |
| * Merge branch 'feature/cleanup-popups' into release/0.16Louise Crow2014-01-14-85/+84
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/views/layouts/default.html.erb config/application.rb public/admin/stylesheets/admin.css
| | * Remove special-notice styling.Louise Crow2014-01-14-2/+0
| | | | | | | | | | | | We've removed it from whatdotheyknow-theme
| | * Don't pad banner and entirebodyLouise Crow2014-01-14-1/+1
| | | | | | | | | | | | banner is inside entirebody.
| | * 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
| | |\|
| | * | Merge branch 'release/0.15' into wdtkMark Longair2013-11-15-3310/+11671
| | |\ \ | |_|/ / |/| | | | | | | | | | | Conflicts: lib/tasks/stats.rake
| | * | 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.)
| | * | Insert cookie stripping at correct point in middleware stack.Louise Crow2013-11-13-1/+13
| | | |
| | * | Session keys are stored as strings in Rails 3.Louise Crow2013-11-13-30/+30
| | | | | | | | | | | | | | | | Update our session-stripping code.
| | * | Merge branch 'wdtk' of ssh://git.mysociety.org/data/git/public/alaveteli ↵Louise Crow2013-10-24-2/+3
| | |\ \ | | | | | | | | | | | | | | | into wdtk