aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Don't put HTML entities in very overdue alert email subject linesHenare Degan2015-04-27-1/+8
|
* Don't put HTML entities in overdue alert email subject linesHenare Degan2015-04-27-1/+8
|
* Don't put HTML entities in requires admin email subject linesHenare Degan2015-04-27-2/+5
|
* Don't put HTML entities in new response email subject linesHenare Degan2015-04-27-1/+5
|
* Merge branch 'hotfix/0.21.0.22' into rails-3-developGareth Rees2015-04-24-4/+4
|\
| * Bump alaveteli versionhotfix/0.21.0.22Gareth Rees2015-04-24-1/+1
| |
| * Update Nicaragua translationsGareth Rees2015-04-24-3/+3
| |
* | Merge remote-tracking branch 'openaustralia_github/email-missing-defunct' ↵Louise Crow2015-04-24-2/+1
|\ \ | | | | | | | | | into rails-3-develop
| * | Don't include defunct authorities in list of missing emailsHenare Degan2015-04-21-1/+1
| | | | | | | | | | | | Fixes #2358
| * | Simplify queryHenare Degan2015-04-21-2/+1
| | |
* | | Merge branch 'hotfix/0.21.0.21' into rails-3-developLouise Crow2015-04-23-3/+1
|\ \ \ | | |/ | |/|
| * | Bump alaveteli version0.21.0.21hotfix/0.21.0.21Louise Crow2015-04-23-1/+1
| | |
| * | Don't redirect to signin on expiration of a non remember-me sessionLouise Crow2015-04-23-2/+0
| | | | | | | | | | | | In practice, it's just confusing if you've been away from the site.
| * | Merge branch 'hotfix/0.21.0.20'0.21.0.20Gareth Rees2015-04-17-13/+11
| |\ \
* | | | Make sure raw emails exist - the tests assume they doLouise Crow2015-04-23-0/+1
| | | |
* | | | Merge remote-tracking branch ↵Louise Crow2015-04-23-35/+48
|\ \ \ \ | | | | | | | | | | | | | | | 'nzherald_github/fix-xapian-macron-highlighting' into rails-3-develop
| * | | | Fix encoding issue with searching for macronsCaleb2015-04-20-35/+48
| | | | | | | | | | | | | | | | | | | | Correct indentation to be consistent
* | | | | Merge remote-tracking branch ↵Louise Crow2015-04-23-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'openaustralia_github/missing-contact-suggestion' into rails-3-develop
| * | | | | Send people to new change request instead of generic contact pageHenare Degan2015-04-21-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | You get to this page by attempting to make a request and being asked to contribute an email for an authority that's missing an email so it makes sense to just send them to the change request page for this authority.
* | | | | Merge remote-tracking branch 'openaustralia_github/blank-request-email' into ↵Louise Crow2015-04-21-10/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | rails-3-develop
| * | | | | Change PublicBody behaviour to not override blank request emailsHenare Degan2015-04-21-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is so if you're overriding the request email you can still observe how Alaveteli behaves when there's no request email set.
| * | | | | Remove unnecessary methodHenare Degan2015-04-21-10/+3
| | | | | |
| * | | | | Describe current PublicBody#request_email behaviour in testsHenare Degan2015-04-21-0/+27
| |/ / / /
* | | | | Merge remote-tracking branch ↵Louise Crow2015-04-21-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 'mysociety_github/2353-precompile-only-in-production' into rails-3-develop
| * | | | Update switch-theme.rbLouise Crow2015-04-20-1/+1
|/ / / /
* | | | Merge remote-tracking branch 'nzherald_github/tweak-health-check' into ↵Louise Crow2015-04-20-1/+6
|\| | | | | | | | | | | | | | | rails-3-develop
| * | | Fixed status check helperCaleb2015-04-20-1/+6
|/ / /
* | | Merge remote-tracking branch ↵Louise Crow2015-04-17-8/+8
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/fix-varnish-cookie-removal' into rails-3-develop
| * | | Strip trailing spaces onlyHenare Degan2015-04-17-7/+7
| | | |
| * | | Don't remove cookies from txt files in suggested Varnish configurationHenare Degan2015-04-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the authentication cookies are removed it means that admins can't download raw emails: https://github.com/openaustralia/righttoknow/issues/513
* | | | Merge branch 'hotfix/0.21.0.20' into rails-3-developGareth Rees2015-04-17-13/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bump alaveteli versionhotfix/0.21.0.20Gareth Rees2015-04-17-1/+1
| | |
| * | Update Nicaragua translationsGareth Rees2015-04-17-12/+10
| |/
| * Merge branch 'hotfix/0.21.0.19'0.21.0.19Gareth Rees2015-04-16-4/+4
| |\
* | \ Merge remote-tracking branch ↵Gareth Rees2015-04-16-1/+6
|\ \ \ | | | | | | | | | | | | 'openaustralia/categorisation-game-mixed-content' into rails-3-develop
| * | | Make alt attribute more descriptive for vision impaired readersHenare Degan2015-04-15-1/+1
| | | |
| * | | Add title attribute so you get a tooltip when hovering over chartHenare Degan2015-04-15-1/+6
| | | |
| * | | Use Rails image tag helperHenare Degan2015-04-15-1/+1
| | | | | | | | | | | | | | | | | | | | Which also generates valid HTML by escaping the ampersands in the src attribute.
| * | | Use HTTPS for categorisation chart to avoid mixed content warningsHenare Degan2015-04-15-1/+1
| | | |
* | | | Merge branch 'hotfix/0.21.0.19' into rails-3-developGareth Rees2015-04-16-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Bump alaveteli versionhotfix/0.21.0.19Gareth Rees2015-04-16-1/+1
| | | |
| * | | Update nicaragua translationsGareth Rees2015-04-16-3/+3
| | |/ | |/|
| * | Merge branch 'hotfix/0.21.0.18'0.21.0.18Gareth Rees2015-04-16-3/+3
| |\ \
* | | | We have no expectation of order here.Louise Crow2015-04-16-1/+1
| | | | | | | | | | | | | | | | Fixes transient failure like https://travis-ci.org/mysociety/alaveteli/jobs/58761975
* | | | Merge branch 'fix-text-masker-logger-call' into rails-3-developLouise Crow2015-04-16-11/+41
|\ \ \ \
| * | | | Break up long line.Louise Crow2015-04-16-1/+9
| | | | |
| * | | | Make syntax a bit more readable.Louise Crow2015-04-16-1/+1
| | | | |
| * | | | Use implicit evaluation.Louise Crow2015-04-16-1/+1
| | | | |
| * | | | Clean up variable nameLouise Crow2015-04-16-2/+2
| | | | |
| * | | | Clean up unneeded local variable.Louise Crow2015-04-16-2/+1
| | | | |