Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Don't remove cookies from txt files in suggested Varnish configuration | Henare Degan | 2015-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 remote-tracking branch ↵ | Gareth Rees | 2015-04-16 | -1/+6 |
|\ | | | | | | | 'openaustralia/categorisation-game-mixed-content' into rails-3-develop | |||
| * | Make alt attribute more descriptive for vision impaired readers | Henare Degan | 2015-04-15 | -1/+1 |
| | | ||||
| * | Add title attribute so you get a tooltip when hovering over chart | Henare Degan | 2015-04-15 | -1/+6 |
| | | ||||
| * | Use Rails image tag helper | Henare Degan | 2015-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 warnings | Henare Degan | 2015-04-15 | -1/+1 |
| | | ||||
* | | Merge branch 'hotfix/0.21.0.19' into rails-3-develop | Gareth Rees | 2015-04-16 | -4/+4 |
|\ \ | ||||
| * | | Bump alaveteli versionhotfix/0.21.0.19 | Gareth Rees | 2015-04-16 | -1/+1 |
| | | | ||||
| * | | Update nicaragua translations | Gareth Rees | 2015-04-16 | -3/+3 |
| | | | ||||
| * | | Merge branch 'hotfix/0.21.0.18'0.21.0.18 | Gareth Rees | 2015-04-16 | -3/+3 |
| |\ \ | ||||
* | | | | We have no expectation of order here. | Louise Crow | 2015-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-develop | Louise Crow | 2015-04-16 | -11/+41 |
|\ \ \ \ | ||||
| * | | | | Break up long line. | Louise Crow | 2015-04-16 | -1/+9 |
| | | | | | ||||
| * | | | | Make syntax a bit more readable. | Louise Crow | 2015-04-16 | -1/+1 |
| | | | | | ||||
| * | | | | Use implicit evaluation. | Louise Crow | 2015-04-16 | -1/+1 |
| | | | | | ||||
| * | | | | Clean up variable name | Louise Crow | 2015-04-16 | -2/+2 |
| | | | | | ||||
| * | | | | Clean up unneeded local variable. | Louise Crow | 2015-04-16 | -2/+1 |
| | | | | | ||||
| * | | | | Refactor a bit to allow testing of logic branches. | Louise Crow | 2015-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 here | Henare Degan | 2015-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-develop | Louise Crow | 2015-04-16 | -7/+26 |
|\ \ \ \ \ | ||||
| * | | | | | Destroy associated censor rules and comments. | Louise Crow | 2015-04-13 | -0/+19 |
| | | | | | | ||||
| * | | | | | Remove unneeded references to self. | Louise Crow | 2015-04-13 | -7/+7 |
| | | | | | | ||||
* | | | | | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2015-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-develop | Gareth Rees | 2015-04-16 | -3/+3 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||
| | * | | | | | Bump alaveteli versionhotfix/0.21.0.18 | Gareth Rees | 2015-04-16 | -1/+1 |
| | | | | | | | ||||
| | * | | | | | Update Nicaragua translations | Gareth Rees | 2015-04-16 | -2/+2 |
| | | |_|/ / | | |/| | | | ||||
| | * | | | | Merge branch 'hotfix/0.21.0.17'0.21.0.17 | Gareth Rees | 2015-04-16 | -5/+5 |
| | |\ \ \ \ | ||||
| * | \ \ \ \ | Merge branch 'hotfix/0.21.0.17' into rails-3-develop | Gareth Rees | 2015-04-16 | -5/+5 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | | | ||||
| | * | | | | Bump alaveteli versionhotfix/0.21.0.17 | Gareth Rees | 2015-04-16 | -1/+1 |
| | | | | | | ||||
| | * | | | | Update Nicaragua translations | Gareth Rees | 2015-04-16 | -4/+4 |
| | |/ / / | ||||
| | * | | | Merge branch 'hotfix/0.21.0.16'0.21.0.16 | Gareth Rees | 2015-04-15 | -26/+23 |
| | |\ \ \ | ||||
| * | \ \ \ | Merge branch 'hotfix/0.21.0.16' into rails-3-develop | Gareth Rees | 2015-04-15 | -26/+23 |
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | ||||
| | * | | | Bump alaveteli versionhotfix/0.21.0.16 | Gareth Rees | 2015-04-15 | -1/+1 |
| | | | | | ||||
| | * | | | Update Nicaragua translations | Gareth Rees | 2015-04-15 | -25/+22 |
| | |/ / | ||||
| | * | | Merge branch 'hotfix/0.21.0.15'0.21.0.15 | Gareth Rees | 2015-04-10 | -30/+30 |
| | |\ \ | ||||
* | | \ \ | Merge branch 'smtp-tweaks' into rails-3-develop | Louise Crow | 2015-04-16 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | Set standard default values. | Louise Crow | 2015-04-14 | -2/+2 |
|/ / / / | ||||
* | | | | Add some notes on the ability to set production mail config. | Louise Crow | 2015-04-14 | -0/+7 |
| | | | | ||||
* | | | | Merge branch 'box-style' into rails-3-develop | Louise Crow | 2015-04-14 | -20/+16 |
|\ \ \ \ | ||||
| * | | | | Apply box style to first describe_state_form. | Louise Crow | 2015-04-14 | -1/+1 |
| | | | | | ||||
| * | | | | remove stray whitespace | Luke Bacon | 2015-04-13 | -1/+0 |
| | | | | | ||||
| * | | | | make box vertical and horizontal padding even | Luke Bacon | 2015-04-13 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/responsive/_global_layout.scss | |||
| * | | | | reduce excess space above correspondence heading | Luke Bacon | 2015-04-13 | -0/+1 |
| | | | | | ||||
| * | | | | remove indentation of comment text | Luke Bacon | 2015-04-13 | -4/+0 |
| | | | | | ||||
| * | | | | replace individual padding styles with generic box class | Luke Bacon | 2015-04-13 | -14/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on correspondence boxes, comment boxes, the state form and the "followup" notice that shared the state form styles. This makes these styles, which are meant to be consistent, easier to maintain and overrider if necessary for theme developers. | |||
| * | | | | add generic style for box padding | Luke Bacon | 2015-04-13 | -0/+8 |
| | |_|/ | |/| | | ||||
* | | | | Merge branch 'smtp-mailer-configuration' into rails-3-develop | Louise Crow | 2015-04-14 | -3/+51 |
|\ \ \ \ | ||||
| * | | | | Make clear that it is only the production delivery method that is being set. | Louise Crow | 2015-04-14 | -6/+6 |
| | | | | | ||||
| * | | | | Fix some typos | Louise Crow | 2015-04-14 | -3/+3 |
| | | | | | ||||
| * | | | | Make clear that SMTP mail settings are SMTP-specific. | Louise Crow | 2015-04-14 | -23/+23 |
| | | | | |