aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove unneeded references to self.Louise Crow2015-04-13-7/+7
|
* Merge branch 'rails-3-develop' of ↵Louise Crow2015-04-10-30/+30
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Merge branch 'hotfix/0.21.0.15' into rails-3-developGareth Rees2015-04-10-30/+30
| |\
| | * Bump alaveteli versionhotfix/0.21.0.15Gareth Rees2015-04-10-1/+1
| | |
| | * Update nicaragua translationsGareth Rees2015-04-10-29/+29
| | |
* | | New icons from @wrightmartin.Louise Crow2015-04-10-0/+0
|/ /
* | Merge branch 'hotfix/0.21.0.14' into rails-3-developLouise Crow2015-04-10-13/+49
|\|
| * Bump alaveteli version.0.21.0.14hotfix/0.21.0.14Louise Crow2015-04-10-1/+1
| |
| * Only use CSRF protection for logged-in users.Louise Crow2015-04-10-1/+12
| |
| * Add warning about updating search forms to release notes.Louise Crow2015-04-10-0/+4
| |
| * Use GET for search forms, not POST.Louise Crow2015-04-10-11/+32
| | | | | | | | | | | | | | | | | | | | Now that we use global CSRF authenticity checks, searches were logging logged-in users out as the form is an HTML form, not a Rails-generated form with a CSRF token. So form submission raised an InvalidAuthenticityToken error and reset their session. We could generate the form in Rails, but we also want to minimise the number of non-logged in people who have a session cookie, so that varnish can cache pages extensively. So we don't want to put the CSRF token for the search form in everyone's session.
| * Merge branch 'hotfix/0.21.0.13'0.21.0.13Gareth Rees2015-04-09-6/+6
| |\
* | \ Merge remote-tracking branch 'origin/issues/2268-definition-list-spacing' ↵Louise Crow2015-04-10-3/+0
|\ \ \ | | | | | | | | | | | | into rails-3-develop
| * | | remove para declarationMartin Wright2015-04-07-3/+0
| | | | | | | | | | | | | | | | Not needed, causing spacing problems on themes, so they just revert it anyway
* | | | Merge branch 'hotfix/0.21.0.13' into rails-3-developGareth Rees2015-04-09-6/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Bump alaveteli versionhotfix/0.21.0.13Gareth Rees2015-04-09-1/+1
| | | |
| * | | Update nicaragua translationsGareth Rees2015-04-09-5/+5
| | |/ | |/|
| * | Merge branch 'hotfix/0.21.0.12'0.21.0.12Gareth Rees2015-04-09-13/+13
| |\ \
* | \ \ Merge branch 'hotfix/0.21.0.12' into rails-3-developGareth Rees2015-04-09-13/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Bump alaveteli versionhotfix/0.21.0.12Gareth Rees2015-04-09-1/+1
| | | |
| * | | Update Nicaragua translationsGareth Rees2015-04-09-12/+12
| |/ /
| * | Merge branch 'hotfix/0.21.0.11'0.21.0.11Gareth Rees2015-04-08-14/+14
| |\ \
* | \ \ Merge branch 'hotfix/0.21.0.11' into rails-3-developGareth Rees2015-04-08-14/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Bump alaveteli versionhotfix/0.21.0.11Gareth Rees2015-04-08-1/+1
| | | |
| * | | Update Nicaragua translationsGareth Rees2015-04-08-13/+13
| |/ /
| * | Merge branch 'hotfix/0.21.0.10'0.21.0.10Gareth Rees2015-04-08-6/+5
| |\ \
* | \ \ Merge branch 'update_holidays' into rails-3-developGareth Rees2015-04-08-3/+3
|\ \ \ \
| * | | | Update holidays gemGareth Rees2015-03-19-3/+3
| | | | | | | | | | | | | | | | | | | | http://git.io/hR7f
| * | | | Update holidays gemGareth Rees2015-03-17-3/+3
| | | | | | | | | | | | | | | | | | | | https://github.com/alexdunae/holidays/blob/master/CHANGELOG.md#110
* | | | | Merge remote-tracking branch 'origin/garethrees-patch-1' into rails-3-developGareth Rees2015-04-08-3/+2
|\ \ \ \ \
| * | | | | Remove pledgebank mentionGareth Rees2015-03-30-3/+2
| | | | | |
* | | | | | Merge branch 'hotfix/0.21.0.10' into rails-3-developGareth Rees2015-04-08-6/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Bump alaveteli versionhotfix/0.21.0.10Gareth Rees2015-04-08-1/+1
| | | | | |
| * | | | | Update Nicaragua translationsGareth Rees2015-04-08-4/+4
| | | | | |
| * | | | | Whitespace update of Croatian translationGareth Rees2015-04-08-1/+0
| | |_|/ / | |/| | |
| * | | | Merge branch 'hotfix/0.21.0.9'0.21.0.9Gareth Rees2015-04-08-5/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'hotfix/0.21.0.9' into rails-3-developGareth Rees2015-04-08-5/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Bump alaveteli versionhotfix/0.21.0.9Gareth Rees2015-04-08-1/+1
| | | | | |
| * | | | | Update Nicaragua translationsGareth Rees2015-04-08-4/+4
| |/ / / /
| * | | | Merge branch 'hotfix/0.21.0.8'0.21.0.8Gareth Rees2015-04-08-72/+75
| |\ \ \ \
* | \ \ \ \ Merge branch 'hotfix/0.21.0.8' into rails-3-developGareth Rees2015-04-08-72/+75
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Bump alaveteli versionhotfix/0.21.0.8Gareth Rees2015-04-08-1/+1
| | | | |
| * | | | Update Nicaragua translationsGareth Rees2015-04-07-71/+74
| |/ / /
* | | | Merge branch 'master' into rails-3-developLouise Crow2015-04-07-7/+25
|\| | |
| * | | Merge branch 'hotfix/0.21.0.7'0.21.0.7Louise Crow2015-04-07-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb
| | * | | Bump alaveteli version.hotfix/0.21.0.7Louise Crow2015-04-07-1/+1
| | | | |
| | * | | Add note on URLs in existing emails.Louise Crow2015-04-07-1/+3
| | | | |
| * | | | Merge branch 'hotfix/0.21.0.6'0.21.0.6Louise Crow2015-04-07-5/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/initializers/alaveteli.rb
| | * | | | Bump alaveteli version.hotfix/0.21.0.6Louise Crow2015-04-07-1/+1
| | | | | |
| | * | | | Fix failure to capitalise when non category tag precedes categories.Louise Crow2015-04-07-4/+5
| | |/ / / | | | | | | | | | | | | | | | Thanks to @RichardTaylor for reporting.