aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Whitelist UserController#signup params0.16.0.9hotfix/0.16.0.9Gareth Rees2014-09-09-1/+15
| | | | Protects from mass-assignment exploit attempts
* Merge branch 'hotfix/0.16.0.8' of ↵0.16.0.8Louise Crow2014-03-03-1/+2
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into hotfix/0.16.0.8
| * Set the blackhole address as the return path for import error messages.hotfix/0.16.0.8Louise Crow2014-02-28-1/+2
| | | | | | | | | | Also send them directly to the non-bounce address, don't pipe them through mailin again.
* | Merge branch 'hotfix/0.16.0.7' into wdtkLouise Crow2014-02-19-38/+52
|\|
| * Upgrade to latest version of Rails0.16.0.7hotfix/0.16.0.7Louise Crow2014-02-19-28/+28
| |
| * 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.
* | Use HTTPS Google docs viewer where using HTTPS for alaveteliLouise Crow2014-02-18-1/+2
| |
* | Make all WDTK references use HTTPS.Matthew Somerville2014-02-18-9/+9
| |
* | Merge branch 'hotfix/0.16.0.3' into wdtkLouise Crow2014-01-27-2/+16
|\|
| * 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
| |\
* | \ Merge branch 'welsh-fixes' into wdtkLouise Crow2014-01-27-8/+8
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: locale/cy/app.po
| * | | Latest version of Welsh translationLouise Crow2014-01-27-192/+188
| | | | | | | | | | | | | | | | | | | | | | | | Includes interpolated variable name fix for "Efallai y byddwch yn gallu dod o hyd i un ar eu gwefan, neu drwy eu ffonio nhw a gofyn. Os llwyddwch i ddod o hyd i un, <a href=\"{{url}}\"> anfonwch e atom</a>."
| * | | Use escape_javascript on translated strings in Javascript stringsMark Longair2014-01-24-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The Welsh translations of some of these words contain single quotes; escape them in the view so that the Javascript doesn't contain syntax errors.
| * | | Add <br/>s in the Welsh title on the homepageMark Longair2014-01-24-1/+1
| | | | | | | | | | | | | | | | Otherwise the long title overlaps the flying computer logo.
* | | | Merge branch 'hotfix/0.16.0.1' into wdtkLouise Crow2014-01-24-3/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: app/views/request/_view_html_stylesheet.html.erb
| * | | 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
| |\ \
* | | | Fixing more typosLouise Crow2014-01-24-2/+2
| | | |
* | | | Point at application.cssLouise Crow2014-01-24-1/+1
| | | |
* | | | Fix typoLouise Crow2014-01-24-1/+1
| | | |
* | | | Restore survey variables.Louise Crow2014-01-24-0/+5
| | | |
* | | | Merge branch 'release/0.16' into wdtkLouise Crow2014-01-24-3363/+19753
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| * | | Add a note about deleting vendor/pluginsLouise Crow2013-12-19-0/+9
| | | |
| * | | Merge branch 'rails-3-develop' into release/0.16Louise Crow2013-12-16-2/+2
| |\ \ \
| | * \ \ 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.
| * | | | Merge branch 'rails-3-develop' into release/0.16Louise Crow2013-12-11-17/+2
| |\| | |
| | * | | Remove old patch.Louise Crow2013-12-11-16/+0
| | | | |
| | * | | Small fixes for favicon.icoLouise Crow2013-12-10-1/+2
| | | | |
| * | | | Add release notes for 0.16Louise Crow2013-12-10-0/+43
| |/ / /
| * | | Syntax fixes.Louise Crow2013-12-09-5/+5
| | | |