aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
| | | | |
| * | | | Refactor a bit to allow testing of logic branches.Louise Crow2015-04-16-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | Add specs for current behaviour on failure to uncompress, failure to compress.
| * | | | Call logger explicitly because it's not in scope hereHenare Degan2015-04-16-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Prevents exception `undefined local variable or method 'logger' for AlaveteliTextMasker:Module` being thrown.
* | | | | Merge branch 'issues/556-info_request_destroy' into rails-3-developLouise Crow2015-04-16-7/+26
|\ \ \ \ \
| * | | | | Destroy associated censor rules and comments.Louise Crow2015-04-13-0/+19
| | | | | |
| * | | | | Remove unneeded references to self.Louise Crow2015-04-13-7/+7
| | | | | |
* | | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2015-04-16-29/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ \ Merge branch 'hotfix/0.21.0.18' into rails-3-developGareth Rees2015-04-16-3/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bump alaveteli versionhotfix/0.21.0.18Gareth Rees2015-04-16-1/+1
| | | | | | |
| | * | | | | Update Nicaragua translationsGareth Rees2015-04-16-2/+2
| | | |_|/ / | | |/| | |
| | * | | | Merge branch 'hotfix/0.21.0.17'0.21.0.17Gareth Rees2015-04-16-5/+5
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'hotfix/0.21.0.17' into rails-3-developGareth Rees2015-04-16-5/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Bump alaveteli versionhotfix/0.21.0.17Gareth Rees2015-04-16-1/+1
| | | | | |
| | * | | | Update Nicaragua translationsGareth Rees2015-04-16-4/+4
| | |/ / /
| | * | | Merge branch 'hotfix/0.21.0.16'0.21.0.16Gareth Rees2015-04-15-26/+23
| | |\ \ \
| * | \ \ \ Merge branch 'hotfix/0.21.0.16' into rails-3-developGareth Rees2015-04-15-26/+23
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Bump alaveteli versionhotfix/0.21.0.16Gareth Rees2015-04-15-1/+1
| | | | |
| | * | | Update Nicaragua translationsGareth Rees2015-04-15-25/+22
| | |/ /
| | * | Merge branch 'hotfix/0.21.0.15'0.21.0.15Gareth Rees2015-04-10-30/+30
| | |\ \
* | | \ \ Merge branch 'smtp-tweaks' into rails-3-developLouise Crow2015-04-16-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Set standard default values.Louise Crow2015-04-14-2/+2
|/ / / /
* | | | Add some notes on the ability to set production mail config.Louise Crow2015-04-14-0/+7
| | | |
* | | | Merge branch 'box-style' into rails-3-developLouise Crow2015-04-14-20/+16
|\ \ \ \
| * | | | Apply box style to first describe_state_form.Louise Crow2015-04-14-1/+1
| | | | |
| * | | | remove stray whitespaceLuke Bacon2015-04-13-1/+0
| | | | |